@jskit-ai/jskit-cli 0.2.74 → 0.2.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/jskit-cli",
-  "version": "0.2.74",
+  "version": "0.2.76",
   "description": "Bundle and package orchestration CLI for JSKIT apps.",
   "type": "module",
   "files": [
@@ -20,9 +20,9 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@jskit-ai/jskit-catalog": "0.1.73",
-    "@jskit-ai/kernel": "0.1.65",
-    "@jskit-ai/shell-web": "0.1.64"
+    "@jskit-ai/jskit-catalog": "0.1.75",
+    "@jskit-ai/kernel": "0.1.67",
+    "@jskit-ai/shell-web": "0.1.66"
   },
   "engines": {
     "node": "20.x"

package/src/server/cliRuntime/completion.js

@@ -2,6 +2,10 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { access, readdir, readFile } from "node:fs/promises";
 import { buildCrudFieldContractMap } from "@jskit-ai/kernel/shared/support/crudFieldContract";
+import {
+  discoverPlacementTopologyFromApp,
+  discoverShellOutletTargetsFromApp
+} from "@jskit-ai/kernel/server/support";
 import {
   buildAppCommandOptionMeta,
   listAppCommandDefinitions
@@ -370,6 +374,37 @@ async function discoverPlacementTargets(appRoot) {
   return uniqueSorted(placementValues);
 }
 
+async function discoverSemanticPlacementTargets(appRoot) {
+  try {
+    const topology = await discoverPlacementTopologyFromApp({ appRoot });
+    return uniqueSorted(
+      (Array.isArray(topology?.placements) ? topology.placements : [])
+        .map((placement) => normalizeText(placement?.id))
+        .filter(Boolean)
+    );
+  } catch {
+    const topologyPath = path.join(appRoot, "src", "placementTopology.js");
+    if (!(await pathExists(topologyPath))) {
+      return [];
+    }
+    const source = await readFile(topologyPath, "utf8");
+    return uniqueSorted(extractMatches(source, [/\bid\s*:\s*["']([^"':]+(?:\.[^"':]+)+)["']/g]));
+  }
+}
+
+async function discoverConcretePlacementTargets(appRoot) {
+  try {
+    const discovered = await discoverShellOutletTargetsFromApp({ appRoot });
+    return uniqueSorted(
+      (Array.isArray(discovered?.targets) ? discovered.targets : [])
+        .map((target) => normalizeText(target?.id || target?.target))
+        .filter(Boolean)
+    );
+  } catch {
+    return discoverPlacementTargets(appRoot);
+  }
+}
+
 async function discoverComponentTokens(appRoot) {
   const tokens = [];
   for (const filePath of [
@@ -391,7 +426,6 @@ async function discoverComponentTokens(appRoot) {
     const source = await readFile(filePath, "utf8");
     tokens.push(...extractMatches(source, [
       /\bcomponentToken\s*:\s*["']([^"']+)["']/g,
-      /\bdefault-link-component-token\s*=\s*["']([^"']+)["']/g,
       /registerMainClientComponent\(\s*["']([^"']+)["']/g
     ]));
   }
@@ -590,9 +624,11 @@ async function completeOptionValue({
 
   if (normalizedOptionName === "resource-file") {
     suggestions = await discoverResourceFiles(appRoot);
-  } else if (["link-placement", "placement", "target"].includes(normalizedOptionName)) {
-    suggestions = await discoverPlacementTargets(appRoot);
-  } else if (normalizedOptionName === "link-component-token") {
+  } else if (["link-placement", "placement"].includes(normalizedOptionName)) {
+    suggestions = await discoverSemanticPlacementTargets(appRoot);
+  } else if (normalizedOptionName === "target") {
+    suggestions = await discoverConcretePlacementTargets(appRoot);
+  } else if (normalizedOptionName === "link-renderer") {
     suggestions = await discoverComponentTokens(appRoot);
   } else if (normalizedOptionName === "surface") {
     suggestions = await discoverSurfaces(appRoot);

package/src/server/cliRuntime/mutations/textMutations.js

@@ -113,6 +113,13 @@ async function applyTextMutations(
       const previous = await readFileBufferIfExists(absoluteFile);
       const previousContent = previous.exists ? previous.buffer.toString("utf8") : "";
       const mutationId = String(mutation?.id || "").trim() || "append-text";
+      const interpolatedSkipChecks = normalizeSkipChecks(mutation?.skipIfContains)
+        .map((entry) => interpolateOptionValue(entry, options, packageEntry.packageId, `${mutationId}.skipIfContains`))
+        .filter((entry) => String(entry || "").trim().length > 0);
+      if (interpolatedSkipChecks.some((pattern) => previousContent.includes(String(pattern)))) {
+        continue;
+      }
+
       const resolvedSnippet = interpolateOptionValue(snippet, options, packageEntry.packageId, mutationId);
       const templateContextReplacements = await resolveTemplateContextReplacementsForMutation({
         packageEntry,
@@ -126,8 +133,7 @@ async function applyTextMutations(
       const renderedSnippet = templateContextReplacements
         ? applyTemplateContextReplacements(resolvedSnippet, templateContextReplacements)
         : resolvedSnippet;
-      const skipChecks = normalizeSkipChecks(mutation?.skipIfContains)
-        .map((entry) => interpolateOptionValue(entry, options, packageEntry.packageId, `${mutationId}.skipIfContains`))
+      const skipChecks = interpolatedSkipChecks
         .map((entry) => {
           if (!templateContextReplacements) {
             return entry;

package/src/server/cliRuntime/packageIntrospection/placementNormalization.js

@@ -3,7 +3,11 @@ import {
   ensureObject
 } from "../../shared/collectionUtils.js";
 import {
-  normalizeShellOutletTargetId
+  normalizePlacementKind,
+  normalizePlacementOwnerId,
+  normalizePlacementTopologyDefinition,
+  normalizeShellOutletTargetId,
+  resolvePlacementTargetReference
 } from "@jskit-ai/kernel/shared/support/shellLayoutTargets";
 
 function normalizePlacementOutlets(value) {
@@ -41,22 +45,27 @@ function normalizePlacementContributions(value) {
   for (const entry of ensureArray(value)) {
     const record = ensureObject(entry);
     const id = String(record.id || "").trim();
-    const target = normalizeShellOutletTargetId(record.target);
-    if (!id || !target) {
+    const targetReference = resolvePlacementTargetReference(record.target);
+    if (!id || !targetReference?.id) {
       continue;
     }
 
     const surfaces = [...new Set(ensureArray(record.surfaces).map((item) => String(item || "").trim()).filter(Boolean))];
+    const kind = normalizePlacementKind(record.kind) || (String(record.componentToken || "").trim() ? "component" : "link");
     const componentToken = String(record.componentToken || "").trim();
     const when = String(record.when || "").trim();
     const description = String(record.description || "").trim();
     const source = String(record.source || "").trim();
+    const owner = normalizePlacementOwnerId(record.owner);
     const parsedOrder = Number(record.order);
     const order = Number.isFinite(parsedOrder) ? Math.trunc(parsedOrder) : null;
     contributions.push(
       Object.freeze({
         id,
-        target,
+        target: targetReference.id,
+        targetType: targetReference.type,
+        owner,
+        kind,
         surfaces: Object.freeze(surfaces),
         order,
         componentToken,
@@ -83,7 +92,12 @@ function normalizePlacementContributions(value) {
   );
 }
 
+function normalizePlacementTopology(value, { context = "package placement topology" } = {}) {
+  return normalizePlacementTopologyDefinition(value, { context }).placements;
+}
+
 export {
   normalizePlacementContributions,
-  normalizePlacementOutlets
+  normalizePlacementOutlets,
+  normalizePlacementTopology
 };

package/src/server/commandHandlers/health.js

@@ -1825,8 +1825,12 @@ function createHealthCommands(ctx = {}) {
     return false;
   }
 
-  function isSharedListFiltersImportSource(sourcePath = "") {
-    return /(^|\/)shared\/[^/'"]*ListFilters(?:\.[A-Za-z0-9]+)?$/u.test(String(sourcePath || "").trim());
+  function isListFiltersImportSource(sourcePath = "") {
+    const normalizedSource = String(sourcePath || "").trim();
+    return (
+      /(^|\/)shared\/[^/'"]*ListFilters(?:\.[A-Za-z0-9]+)?$/u.test(normalizedSource) ||
+      /^\.\/listFilters\.[A-Za-z0-9]+$/u.test(normalizedSource)
+    );
   }
 
   function findCallSites(sourceText = "", calleeName = "") {
@@ -1872,22 +1876,22 @@ function createHealthCommands(ctx = {}) {
 
         if (!firstArgument || firstArgument.startsWith("{")) {
           issues.push(
-            `${relativePath}:${lineNumber}: [filters:shared-definition] do not inline structured filter definitions in ${calleeName}(...). Put them in packages/<crud>/src/shared/<crud>ListFilters.js and import that shared module.`
+            `${relativePath}:${lineNumber}: [filters:shared-definition] do not inline structured filter definitions in ${calleeName}(...). Put them in listFilters.js or packages/<crud>/src/shared/<crud>ListFilters.js and import that module.`
           );
           continue;
         }
 
         if (!/^[A-Za-z_$][\w$]*$/u.test(firstArgument)) {
           issues.push(
-            `${relativePath}:${lineNumber}: [filters:shared-definition] ${calleeName}(...) must receive a definitions symbol imported from a CRUD shared *ListFilters module, not an ad-hoc expression.`
+            `${relativePath}:${lineNumber}: [filters:shared-definition] ${calleeName}(...) must receive a definitions symbol imported from listFilters.js or a CRUD shared *ListFilters module, not an ad-hoc expression.`
           );
           continue;
         }
 
         const importSource = importBindings.get(firstArgument) || "";
-        if (!isSharedListFiltersImportSource(importSource)) {
+        if (!isListFiltersImportSource(importSource)) {
           issues.push(
-            `${relativePath}:${lineNumber}: [filters:shared-definition] ${calleeName}(${firstArgument}, ...) must use definitions imported from a CRUD shared *ListFilters module. Found ${importSource ? `import source "${importSource}"` : "a local symbol"} instead.`
+            `${relativePath}:${lineNumber}: [filters:shared-definition] ${calleeName}(${firstArgument}, ...) must use definitions imported from listFilters.js or a CRUD shared *ListFilters module. Found ${importSource ? `import source "${importSource}"` : "a local symbol"} instead.`
           );
         }
       }