lvs: upgrade to python-ndn@61ae7868

yoursunny · Oct 28, 2024 · 579480f · 579480f
1 parent 2d59f68
commit 579480f
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 20 deletions.
diff --git a/integ/browser-tests/package.json b/integ/browser-tests/package.json
@@ -25,11 +25,11 @@
   "devDependencies": {
     "@nodelib/fs.walk": "^2.0.0",
     "@types/webpack": "^5.28.5",
-    "@zenfs/core": "1.1.2",
+    "@zenfs/core": "1.1.4",
     "@zenfs/dom": "1.0.1",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "html-webpack-plugin": "^5.6.3",
-    "puppeteer": "^23.6.0",
+    "puppeteer": "^23.6.1",
     "ts-loader": "^9.5.1",
     "tslib": "^2.8.0",
     "type-fest": "^4.26.1",

diff --git a/integ/cxx-tests/package.json b/integ/cxx-tests/package.json
@@ -14,7 +14,7 @@
     "tslib": "^2.8.0"
   },
   "devDependencies": {
-    "execa": "^9.4.1",
+    "execa": "^9.5.0",
     "streaming-iterables": "^8.0.1"
   }
 }
diff --git a/package.json b/package.json
@@ -13,18 +13,18 @@
     "test": "vitest",
     "typedoc": "bash mk/typedoc.sh"
   },
-  "packageManager": "[email protected].2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228",
+  "packageManager": "[email protected].3+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee",
   "devDependencies": {
-    "@types/node": "^20.17.0",
+    "@types/node": "^20.17.2",
     "@types/wtfnode": "^0.7.3",
-    "@typescript/lib-dom": "npm:@types/[email protected].174",
-    "@vitest/coverage-v8": "^2.1.3",
+    "@typescript/lib-dom": "npm:@types/[email protected].175",
+    "@vitest/coverage-v8": "^2.1.4",
     "@yoursunny/xo-config": "0.59.0",
     "codedown": "^3.2.1",
     "tslib": "^2.8.0",
     "typedoc": "^0.26.10",
     "typescript": "~5.6.3",
-    "vitest": "^2.1.3"
+    "vitest": "^2.1.4"
   },
   "engines": {
     "node": "^20.12.0 || ^22.0.0"

diff --git a/pkg/fileserver/package.json b/pkg/fileserver/package.json
@@ -32,7 +32,7 @@
     "@ndn/segmented-object": "workspace:*",
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
-    "@zenfs/core": "1.1.2",
+    "@zenfs/core": "1.1.4",
     "mnemonist": "^0.39.8",
     "obliterator": "^2.0.4",
     "streaming-iterables": "^8.0.1",

diff --git a/pkg/keychain-cli/package.json b/pkg/keychain-cli/package.json
@@ -35,7 +35,7 @@
     "env-var": "^7.5.0",
     "fast-chunk-string": "^1.0.1",
     "get-stdin": "^9.0.0",
-    "nodemailer": "^6.9.15",
+    "nodemailer": "^6.9.16",
     "prompts": "^2.4.2",
     "stdout-stream": "^2.0.0",
     "tslib": "^2.8.0",

diff --git a/pkg/lvs/README.md b/pkg/lvs/README.md
@@ -13,7 +13,7 @@ python3.11 -m venv ~/lvs.venv
 source ~/lvs.venv/bin/activate
 
 # install python-ndn
-pip install 'python-ndn[dev] @ git+https://github.com/named-data/python-ndn@80aeeecbfe43b957c2a920e44b158ee95592e0b0'
+pip install 'python-ndn[dev] @ git+https://github.com/named-data/python-ndn@61ae78687b3662d472024c95f1ebfc0770c3da7b'
 
 # run the compiler
 python ./pkg/lvs/compile.py <~/lvs-model.txt >~/lvs-model.tlv

diff --git a/pkg/lvs/src/translate.ts b/pkg/lvs/src/translate.ts
@@ -42,10 +42,7 @@ class Translator {
   }
 
   private nameTag(tag: number): string {
-    // TODO
-    const prefix = this.tagSymbols.get(tag) ?? `_TAG_${tag}`;
-    const suffix = tag > this.model.namedPatternCnt ? `_${++this.lastAutoId}` : "";
-    return `${prefix}${suffix}`;
+    return this.tagSymbols.get(tag) ?? `_TAG_${tag}`;
   }
 
   private gatherNodes(): void {

diff --git a/pkg/lvs/test-fixture/pyndn0.tlv b/pkg/lvs/test-fixture/pyndn0.tlv
diff --git a/pkg/lvs/test-fixture/pyndn1.tlv b/pkg/lvs/test-fixture/pyndn1.tlv
diff --git a/pkg/lvs/test-fixture/pyndn2.tlv b/pkg/lvs/test-fixture/pyndn2.tlv
diff --git a/pkg/lvs/test-fixture/pyndn3.rs b/pkg/lvs/test-fixture/pyndn3.rs
@@ -1 +1,3 @@
+// https://github.com/named-data/python-ndn/blob/61ae78687b3662d472024c95f1ebfc0770c3da7b/docs/src/lvs/lvs.rst#user-functions
+
 #rule: /a/b & { b: $fn("c", a) }
diff --git a/pkg/ndncert/package.json b/pkg/ndncert/package.json
@@ -38,7 +38,7 @@
     "ajv": "^8.17.1",
     "b64-lite": "^1.4.0",
     "imap-emails": "^1.0.4",
-    "nodemailer": "^6.9.15",
+    "nodemailer": "^6.9.16",
     "p-timeout": "^6.1.3",
     "tslib": "^2.8.0",
     "type-fest": "^4.26.1",

diff --git a/pkg/ndnsec/package.json b/pkg/ndnsec/package.json
@@ -30,7 +30,7 @@
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
     "@yoursunny/asn1": "0.0.20200718",
-    "execa": "^9.4.1",
+    "execa": "^9.5.0",
     "tslib": "^2.8.0"
   }
 }
diff --git a/pkg/pyrepo/package.json b/pkg/pyrepo/package.json
@@ -46,7 +46,7 @@
     "@ndn/ndnsec": "workspace:^",
     "@ndn/nfdmgmt": "workspace:^",
     "@types/netmask": "^2.0.5",
-    "execa": "^9.4.1",
+    "execa": "^9.5.0",
     "netmask": "^2.0.2"
   }
 }
diff --git a/pkg/segmented-object/package.json b/pkg/segmented-object/package.json
@@ -31,12 +31,12 @@
     "@ndn/naming-convention2": "workspace:*",
     "@ndn/packet": "workspace:*",
     "@ndn/util": "workspace:*",
-    "@zenfs/core": "1.1.2",
+    "@zenfs/core": "1.1.4",
     "it-keepalive": "^1.2.0",
     "mnemonist": "^0.39.8",
     "obliterator": "^2.0.4",
     "p-defer": "^4.0.1",
-    "p-lazy": "^4.0.0",
+    "p-lazy": "^5.0.0",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.8.0",
     "typescript-event-target": "^1.1.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		// https://github.com/named-data/python-ndn/blob/61ae78687b3662d472024c95f1ebfc0770c3da7b/docs/src/lvs/lvs.rst#user-functions

		#rule: /a/b & { b: $fn("c", a) }