@neocompose/cli 0.6.0 → 0.6.1

package/dist/neo.mjs

@@ -28256,29 +28256,38 @@ function genericConstraint(context, type) {
   };
 }
 function inheritedMemberId(context, ownerClass, name) {
-  const baseType = ownerClass.baseTypes.find(
+  const directBase = ownerClass.baseTypes.find(
     (entry) => context.classIdsByName.has(entry.name)
   );
-  if (!baseType) return null;
-  const baseClass = context.baseClasses.get(
-    requiredName(context.classIdsByName, baseType.name, "class")
-  );
-  if (baseClass !== void 0) return baseClass.schema[name] ?? null;
-  const baseClassId = requiredName(
-    context.classIdsByName,
-    baseType.name,
-    "class"
-  );
-  const sourceBase = context.sourceClasses.get(baseClassId);
-  if (sourceBase === void 0) return null;
-  const sourceMember = sourceBase.members.find(
-    (member) => member.name === name
-  );
-  return sourceMember === void 0 ? null : materializedId(
-    sourceMember,
-    "member",
-    `${sourceBase.name}.${sourceMember.name}`
-  );
+  let classId = directBase ? requiredName(context.classIdsByName, directBase.name, "class") : null;
+  const visited = /* @__PURE__ */ new Set();
+  while (classId !== null && !visited.has(classId)) {
+    visited.add(classId);
+    const sourceClass = context.sourceClasses.get(classId);
+    if (sourceClass !== void 0) {
+      const sourceMember = sourceClass.members.find(
+        (member) => member.name === name
+      );
+      if (sourceMember !== void 0) {
+        return materializedId(
+          sourceMember,
+          "member",
+          `${sourceClass.name}.${sourceMember.name}`
+        );
+      }
+      const sourceBase = sourceClass.baseTypes.find(
+        (entry) => context.classIdsByName.has(entry.name)
+      );
+      classId = sourceBase ? requiredName(context.classIdsByName, sourceBase.name, "class") : null;
+      continue;
+    }
+    const pulledClass = context.baseClasses.get(classId);
+    if (pulledClass === void 0) return null;
+    const memberId = pulledClass.schema[name];
+    if (memberId !== void 0) return memberId;
+    classId = pulledClass.extendsClassId;
+  }
+  return null;
 }
 function resolveQualifiedMemberId(context, expression) {
   const match = /^([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(
@@ -39728,6 +39737,7 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest) {
     if (record3.recordKind === "value") pulledValueIds.add(record3.recordId);
   }
   const memberDefaultValues = /* @__PURE__ */ new Map();
+  const seeds = /* @__PURE__ */ new Map();
   for (const sourceClass of analysis.schema.classes) {
     for (const declaration of sourceClass.members) {
       if (declaration.kind !== "field" || declaration.initializer === null) {
@@ -39736,13 +39746,6 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest) {
       if (declaration.modifiers.includes("static")) continue;
       const label = `${sourceClass.name}.${declaration.name}`;
       const memberId = sourceIdentityId(declaration, "member", label);
-      const baseData3 = stateData(context, "member", memberId);
-      if (baseData3 === null) continue;
-      const backed = rowBackedDefaultBody(
-        baseData3,
-        (id2) => pulledValueIds.has(id2)
-      );
-      if (backed === null) continue;
       const member = context.members.get(memberId);
       if (member === void 0) continue;
       const binding = {
@@ -39751,17 +39754,52 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest) {
         source: declaration.source,
         label
       };
-      memberDefaultValues.set(
-        memberId,
-        lowerRowBackedDefault(context, member, backed, baseData3, binding)
+      const baseData3 = stateData(context, "member", memberId);
+      const backed = baseData3 === null ? null : rowBackedDefaultBody(baseData3, (id2) => pulledValueIds.has(id2));
+      if (backed !== null && baseData3 !== null) {
+        memberDefaultValues.set(
+          memberId,
+          lowerRowBackedDefault(context, member, backed, baseData3, binding)
+        );
+        continue;
+      }
+      const expression = parseCachedInitializer(
+        context.parsedInitializers,
+        declaration.initializer
+      );
+      if (!defaultRequiresOwnedRows(member, expression)) continue;
+      const rootValueId = pendingValueId(binding, `${label}.default`);
+      const seed = lowerStaticSeed(
+        context,
+        member,
+        expression,
+        binding,
+        rootValueId
       );
+      seeds.set(memberId, { ...seed, valueId: rootValueId });
+      memberDefaultValues.set(memberId, {
+        value: seed.value,
+        classId: seed.classId
+      });
     }
   }
   return {
     records: [...context.reconstructed.values()],
-    memberDefaultValues
+    memberDefaultValues,
+    seeds
   };
 }
+function defaultRequiresOwnedRows(member, sourceExpression) {
+  const expression = annotatedValue(sourceExpression).expression;
+  if (member.kind === "class") return expression.kind === "new";
+  if (member.kind === "list") {
+    return expression.kind === "litList" && expression.elements.length > 0;
+  }
+  if (member.kind === "dictionary") {
+    return expression.kind === "litDict" && expression.entries.length > 0;
+  }
+  return false;
+}
 function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
   const baseDefault = isObjectRecord2(baseData3.defaultValue) ? baseData3.defaultValue : {};
   const storedClassId = stringOrNull(baseDefault.classId);
@@ -43737,7 +43775,8 @@ function computeWorkspaceStatus(workspace, options = {}) {
   let staticMemberValueIds = /* @__PURE__ */ new Map();
   let memberDefaults = {
     records: [],
-    memberDefaultValues: /* @__PURE__ */ new Map()
+    memberDefaultValues: /* @__PURE__ */ new Map(),
+    seeds: /* @__PURE__ */ new Map()
   };
   let projectAnalysisV4 = null;
   try {
@@ -43887,7 +43926,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
     projectAnalysisV4,
     manifest
   );
-  staticValueSeeds = staticValues.seeds;
+  staticValueSeeds = new Map([...staticValues.seeds, ...memberDefaults.seeds]);
   staticMemberValueIds = staticValues.memberValueIds;
   const rootRecords = lowerProjectRootSourceV4(
     workspace.state.records,
@@ -61778,7 +61817,7 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
   }
   if (status.staticValueSeeds.size > 0) {
     console.log(
-      `  ${color.dim(`create ${status.staticValueSeeds.size} static value seed(s)`)}`
+      `  ${color.dim(`create ${status.staticValueSeeds.size} member value seed(s)`)}`
     );
   }
   if (options.dryRun) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",