@jskit-ai/ui-generator 0.1.20 → 0.1.22

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/ui-generator",
-  version: "0.1.20",
+  version: "0.1.22",
   kind: "generator",
   description: "Create non-CRUD pages, reusable UI elements, and subpage hosts.",
   options: {
@@ -278,7 +278,7 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/users-web": "0.1.52"
+        "@jskit-ai/users-web": "0.1.54"
       },
       dev: {}
     },

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@jskit-ai/ui-generator",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "type": "module",
   "scripts": {
     "test": "node --test"
   },
   "dependencies": {
-    "@jskit-ai/kernel": "0.1.37",
-    "@jskit-ai/shell-web": "0.1.36"
+    "@jskit-ai/kernel": "0.1.39",
+    "@jskit-ai/shell-web": "0.1.38"
   },
   "exports": {
     "./server/buildTemplateContext": "./src/server/buildTemplateContext.js"

package/src/server/subcommands/page.js

@@ -32,8 +32,8 @@ function renderPageLinkPlacementBlock({
     "    props: {\n" +
     `      label: "${label}",\n` +
     `      surface: "${surface}",\n` +
-    `      workspaceSuffix: "${context.__JSKIT_UI_LINK_WORKSPACE_SUFFIX__}",\n` +
-    `      nonWorkspaceSuffix: "${context.__JSKIT_UI_LINK_NON_WORKSPACE_SUFFIX__}",\n` +
+    `      scopedSuffix: "${context.__JSKIT_UI_LINK_WORKSPACE_SUFFIX__}",\n` +
+    `      unscopedSuffix: "${context.__JSKIT_UI_LINK_NON_WORKSPACE_SUFFIX__}",\n` +
     `${context.__JSKIT_UI_LINK_TO_PROP_LINE__}    },\n` +
     `${String(context.__JSKIT_UI_LINK_WHEN_LINE__ || "")}` +
     "  });\n" +

package/test/addSubpagesSubcommand.test.js

@@ -313,18 +313,27 @@ test("ui-generator add-subpages validates target format", async () => {
   });
 });
 
-test("ui-generator add-subpages rejects target files with a src/pages prefix", async () => {
+test("ui-generator add-subpages accepts target files with a src/pages prefix", async () => {
   await withTempApp(async (appRoot) => {
     await writeAppFixture(appRoot);
 
-    await assert.rejects(
-      runGeneratorSubcommand({
-        appRoot,
-        subcommand: "add-subpages",
-        args: ["src/pages/w/[workspaceSlug]/admin/practice/index.vue"],
-        options: {}
-      }),
-      /must be relative to src\/pages\/, without the src\/pages\/ prefix/
+    const bareTargetFile = "w/[workspaceSlug]/admin/practice/index.vue";
+    const targetFile = `src/pages/${bareTargetFile}`;
+    await writePageFile(appRoot, bareTargetFile);
+
+    const result = await runGeneratorSubcommand({
+      appRoot,
+      subcommand: "add-subpages",
+      args: [targetFile],
+      options: {}
+    });
+
+    assert.ok(result.touchedFiles.includes(targetFile));
+    const pageSource = await readFile(path.join(appRoot, targetFile), "utf8");
+    assert.match(
+      pageSource,
+      /<ShellOutlet target="practice:sub-pages" default-link-component-token="local\.main\.ui\.tab-link-item" \/>/
     );
+    assert.match(pageSource, /<RouterView \/>/);
   });
 });

package/test/pageSubcommand.test.js

@@ -84,7 +84,7 @@ test("ui-generator page subcommand creates an index page from an explicit target
 
     const placementSource = await readFile(path.join(appRoot, "src", "placement.js"), "utf8");
     assert.match(placementSource, /id: "ui-generator\.page\.admin\.practice\.link"/);
-    assert.match(placementSource, /workspaceSuffix: "\/practice"/);
+    assert.match(placementSource, /scopedSuffix: "\/practice"/);
     assert.match(placementSource, /label: "Practice"/);
   });
 });
@@ -107,7 +107,7 @@ test("ui-generator page subcommand creates a file route and derives label from t
     assert.match(pageSource, /<h1 class="text-h5 mb-2">Contact Id<\/h1>/);
 
     const placementSource = await readFile(path.join(appRoot, "src", "placement.js"), "utf8");
-    assert.match(placementSource, /workspaceSuffix: "\/contacts\/\[contactId\]"/);
+    assert.match(placementSource, /scopedSuffix: "\/contacts\/\[contactId\]"/);
     assert.match(placementSource, /id: "ui-generator\.page\.admin\.contacts\.contact-id\.link"/);
     assert.match(placementSource, /label: "Contact Id"/);
   });
@@ -275,7 +275,7 @@ test("ui-generator page subcommand chooses the most specific matching surface pa
 
     const placementSource = await readFile(path.join(appRoot, "src", "placement.js"), "utf8");
     assert.match(placementSource, /id: "ui-generator\.page\.admin\.practice\.link"/);
-    assert.match(placementSource, /workspaceSuffix: "\/practice"/);
+    assert.match(placementSource, /scopedSuffix: "\/practice"/);
   });
 });
 
@@ -314,7 +314,7 @@ test("ui-generator page subcommand accepts target files with a src/pages prefix"
     assert.match(pageSource, /Practice/);
     const placementSource = await readFile(path.join(appRoot, "src", "placement.js"), "utf8");
     assert.match(placementSource, /id: "ui-generator\.page\.admin\.practice\.link"/);
-    assert.match(placementSource, /workspaceSuffix: "\/practice"/);
+    assert.match(placementSource, /scopedSuffix: "\/practice"/);
   });
 });