fix

metatypedev · Jul 21, 2024 · f0bac97 · f0bac97
1 parent 1b48895
commit f0bac97
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 27 deletions.
diff --git a/.ghjk/lock.json b/.ghjk/lock.json
@@ -5,8 +5,8 @@
     "ports": {
       "version": "0",
       "configResolutions": {
-        "bciqos5q4e7g5ykw7yzckpb5uiflkked5rxsjsniknwlsbldm4q3nvcy": {
-          "version": "v1.43.6",
+        "bciqf3eso3sdsxu4og5w6igw3mphr3ipbntahdnhe2kwlgci6osntcfq": {
+          "version": "v1.45.2",
           "buildDepConfigs": {},
           "portRef": "deno_ghrel@0.1.0",
           "specifiedVersion": true
@@ -700,15 +700,15 @@
           "sets": {
             "ghjkEnvProvInstSet___main": {
               "installs": [
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq"
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay"
               ],
               "allowedBuildDeps": "bciqbxqgxii3igrifu254uog6ttjcagotbhy4vmznjm7bpkskgsf6yda"
             },
             "ghjkEnvProvInstSet____rust": {
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq"
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay"
               ],
               "allowedBuildDeps": "bciqbxqgxii3igrifu254uog6ttjcagotbhy4vmznjm7bpkskgsf6yda"
             },
@@ -725,7 +725,7 @@
                 "bciqooc3invqu75sanbnrcamofhdtgui6jcehfcf5fbggccbhjbdxabi",
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqgo3ax6mfzbblfeodvrlgpobj6rllgeqvtexvuuvxvbwev3c4xrci",
                 "bciqcvyjgjkhhqrpxn2t5bewd43yvwujqzapshcuwr2btmxbsobtb7iy",
                 "bciqbml3tljo3tngxutpjcevr4pdgqkvh6cvfznrplrchqvke5m7kd7q",
@@ -744,7 +744,7 @@
                 "bciqhfql42mnvrgemlbikem6oy6bbpos57m4iyvhvinvw3sc56omlu6y",
                 "bciqn5efsjq6kax6nmtia2b7jjvqmsfqzgvisnz5lno5u7seuheydy3i",
                 "bciqk76ralarrfscv72jgxo3mxwhpvy4z3hyb3pliuhgbvwf7mevwrqi",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq"
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay"
               ],
               "allowedBuildDeps": "bciqbxqgxii3igrifu254uog6ttjcagotbhy4vmznjm7bpkskgsf6yda"
             },
@@ -753,7 +753,7 @@
                 "bciqgo3ax6mfzbblfeodvrlgpobj6rllgeqvtexvuuvxvbwev3c4xrci",
                 "bciqcvyjgjkhhqrpxn2t5bewd43yvwujqzapshcuwr2btmxbsobtb7iy",
                 "bciqbml3tljo3tngxutpjcevr4pdgqkvh6cvfznrplrchqvke5m7kd7q",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq"
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay"
               ],
               "allowedBuildDeps": "bciqbxqgxii3igrifu254uog6ttjcagotbhy4vmznjm7bpkskgsf6yda"
             },
@@ -763,7 +763,7 @@
                 "bciqdcngfirmfo7a32evm3n2cuppge7occb6f3caco23iq6eucs7mnjq",
                 "bciqihumb3qmuc2xesnyf3jne7usbjxw7dk52qq53nrvvzex335qbuby",
                 "bciqknnob6elrfg7cgnejgi3vybmixx26dfiwn2tlanflkuqk3mrejkq",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq"
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay"
               ],
               "allowedBuildDeps": "bciqbxqgxii3igrifu254uog6ttjcagotbhy4vmznjm7bpkskgsf6yda"
             },
@@ -775,7 +775,7 @@
                 "bciqooc3invqu75sanbnrcamofhdtgui6jcehfcf5fbggccbhjbdxabi",
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqgo3ax6mfzbblfeodvrlgpobj6rllgeqvtexvuuvxvbwev3c4xrci",
                 "bciqcvyjgjkhhqrpxn2t5bewd43yvwujqzapshcuwr2btmxbsobtb7iy",
                 "bciqbml3tljo3tngxutpjcevr4pdgqkvh6cvfznrplrchqvke5m7kd7q",
@@ -793,7 +793,7 @@
               "installs": [
                 "bciqo5ihfh4qzfdptld75hstrldngcl3qxqnykalseggsalxt74rjuzy",
                 "bciqhxbg6yxnlod6cx6ysrxsgq3ejqvoi6dxtrezzq3chnqfs2xd664y",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq"
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay"
               ],
               "allowedBuildDeps": "bciqbxqgxii3igrifu254uog6ttjcagotbhy4vmznjm7bpkskgsf6yda"
             },
@@ -802,7 +802,7 @@
                 "bciqhfql42mnvrgemlbikem6oy6bbpos57m4iyvhvinvw3sc56omlu6y",
                 "bciqn5efsjq6kax6nmtia2b7jjvqmsfqzgvisnz5lno5u7seuheydy3i",
                 "bciqk76ralarrfscv72jgxo3mxwhpvy4z3hyb3pliuhgbvwf7mevwrqi",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqgo3ax6mfzbblfeodvrlgpobj6rllgeqvtexvuuvxvbwev3c4xrci",
                 "bciqcvyjgjkhhqrpxn2t5bewd43yvwujqzapshcuwr2btmxbsobtb7iy",
                 "bciqbml3tljo3tngxutpjcevr4pdgqkvh6cvfznrplrchqvke5m7kd7q"
@@ -813,7 +813,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqhfql42mnvrgemlbikem6oy6bbpos57m4iyvhvinvw3sc56omlu6y",
                 "bciqn5efsjq6kax6nmtia2b7jjvqmsfqzgvisnz5lno5u7seuheydy3i",
                 "bciqk76ralarrfscv72jgxo3mxwhpvy4z3hyb3pliuhgbvwf7mevwrqi",
@@ -827,7 +827,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqhfql42mnvrgemlbikem6oy6bbpos57m4iyvhvinvw3sc56omlu6y",
                 "bciqn5efsjq6kax6nmtia2b7jjvqmsfqzgvisnz5lno5u7seuheydy3i",
                 "bciqk76ralarrfscv72jgxo3mxwhpvy4z3hyb3pliuhgbvwf7mevwrqi",
@@ -841,7 +841,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqja7ilfqcwwbtzoeqgr2wlfkvwaeuvosddgx7yj4vsjfyirdr7gla",
                 "bciqdcngfirmfo7a32evm3n2cuppge7occb6f3caco23iq6eucs7mnjq",
                 "bciqihumb3qmuc2xesnyf3jne7usbjxw7dk52qq53nrvvzex335qbuby",
@@ -853,7 +853,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqja7ilfqcwwbtzoeqgr2wlfkvwaeuvosddgx7yj4vsjfyirdr7gla",
                 "bciqdcngfirmfo7a32evm3n2cuppge7occb6f3caco23iq6eucs7mnjq",
                 "bciqihumb3qmuc2xesnyf3jne7usbjxw7dk52qq53nrvvzex335qbuby",
@@ -868,7 +868,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqja7ilfqcwwbtzoeqgr2wlfkvwaeuvosddgx7yj4vsjfyirdr7gla",
                 "bciqdcngfirmfo7a32evm3n2cuppge7occb6f3caco23iq6eucs7mnjq",
                 "bciqihumb3qmuc2xesnyf3jne7usbjxw7dk52qq53nrvvzex335qbuby",
@@ -883,7 +883,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqgo3ax6mfzbblfeodvrlgpobj6rllgeqvtexvuuvxvbwev3c4xrci",
                 "bciqcvyjgjkhhqrpxn2t5bewd43yvwujqzapshcuwr2btmxbsobtb7iy",
                 "bciqbml3tljo3tngxutpjcevr4pdgqkvh6cvfznrplrchqvke5m7kd7q"
@@ -894,7 +894,7 @@
               "installs": [
                 "bciqhkh2ldjjs2vliajwk2fsxligeeciqkhsglapbuwhulfanoxlmqjq",
                 "bciqbrychkfu7qrjhcg77jbagzhlyva6yrzudd3szh7jrdncgswcmhci",
-                "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq",
+                "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay",
                 "bciqja7ilfqcwwbtzoeqgr2wlfkvwaeuvosddgx7yj4vsjfyirdr7gla",
                 "bciqdcngfirmfo7a32evm3n2cuppge7occb6f3caco23iq6eucs7mnjq",
                 "bciqihumb3qmuc2xesnyf3jne7usbjxw7dk52qq53nrvvzex335qbuby",
@@ -1807,8 +1807,8 @@
       }
     ],
     "blackboard": {
-      "bciqamrjz2xxx5gxex2xc3fyttudt2fvu2bjvea5kqcwwnvbl2orlbaq": {
-        "version": "1.43.6",
+      "bciqmx5vbsd3z2i62aigooxel47n4c2i7cfg2g7eu4hchscbhwposaay": {
+        "version": "1.45.2",
         "port": {
           "ty": "denoWorker@v1",
           "name": "deno_ghrel",

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -291,8 +291,7 @@ jobs:
             typegate/tests/e2e/self_deploy/self_deploy.ts \
             typegate/tests/metagen/typegraphs/metagen.ts \
             typegraph/deno/sdk/src/*.ts \
-            dev/deps.ts \
-            dev/utils.ts
+            dev/*.ts
 
           deno --unstable-worker-options --unstable-net coverage ./coverage --lcov > coverage.lcov
 

diff --git a/examples/deno.json b/examples/deno.json
@@ -1,5 +1,5 @@
 {
   "imports": {
-    "@typegraph/sdk": "../typegraph/deno/sdk/src"
+    "@typegraph/sdk/": "../typegraph/deno/sdk/src/"
   }
 }
diff --git a/typegate/tests/e2e/cli/dev_test.ts b/typegate/tests/e2e/cli/dev_test.ts
@@ -264,6 +264,9 @@ Meta.test("meta dev with typegate", async (t) => {
     args: ["dev"],
     stdout: "piped",
     stderr: "piped",
+    env: {
+      MCLI_LOADER_CMD: "deno run -A --config deno.json",
+    },
   }).spawn();
   const stderr = new Lines(metadev.stderr);
   const stdout = new Lines(metadev.stdout);

diff --git a/typegate/tests/e2e/published/published_test.ts b/typegate/tests/e2e/published/published_test.ts
@@ -195,10 +195,10 @@ Meta.test(
           }
         }
 
-        // FIXME: we clean out the deno.json used by the examples
-        // before adding the published version due to usage of two
-        // import maps for @typegraph/sdk
-        // remove this line after 0.4.6 is published
+        // NOTE: we clean out the deno.json used by the examples
+        // before adding the published version
+        // by default @typegraph/sdk/ needs that trailing slash
+        // due to https://github.com/WICG/import-maps?tab=readme-ov-file#packages-via-trailing-slashes
         await examplesDir.join("deno.json").writeJson({});
         await $.raw`bash -c 'deno add @typegraph/sdk@${previousVersion}'`
           .cwd(examplesDir)