form0-core 0.1.25 → 0.2.0

package/src/utilities/structured-record.js

@@ -1,9 +1,5 @@
 import { createFormEngine } from '../engine/form-engine.js';
-import {
-  buildDatasetDescriptors,
-  buildFieldIdentityMap,
-  projectDatasetRowValues,
-} from './dataset-descriptors.js';
+import { buildDatasetDescriptors, resolveDatasetRowTitle } from './dataset-descriptors.js';
 import {
   isChoiceFieldLike,
   normalizeStoredChoiceValue,
@@ -81,10 +77,11 @@ const findFirstAliasEntry = (value, aliases) => {
   return null;
 };
 
-const buildScopeFromElements = (elements) => {
+const buildScopeFromElements = (elements, descriptorByRepeatable = new Map()) => {
   const scope = {
     valueFields: [],
     repeatables: [],
+    datasetDescriptor: null,
   };
 
   if (!Array.isArray(elements)) {
@@ -98,7 +95,8 @@ const buildScopeFromElements = (elements) => {
 
     if (CONTAINER_TYPES.has(element.type)) {
       const childScope = buildScopeFromElements(
-        Array.isArray(element.elements) ? element.elements : []
+        Array.isArray(element.elements) ? element.elements : [],
+        descriptorByRepeatable
       );
       scope.valueFields.push(...childScope.valueFields);
       scope.repeatables.push(...childScope.repeatables);
@@ -115,8 +113,15 @@ const buildScopeFromElements = (elements) => {
         aliases: toAliasList(element),
         outputKey,
         repeatableKey: trimString(element.key) ?? trimString(element.data_name) ?? outputKey,
-        childScope: buildScopeFromElements(Array.isArray(element.elements) ? element.elements : []),
+        childScope: buildScopeFromElements(
+          Array.isArray(element.elements) ? element.elements : [],
+          descriptorByRepeatable
+        ),
       });
+      scope.repeatables[scope.repeatables.length - 1].childScope.datasetDescriptor =
+        descriptorByRepeatable.get(trimString(element.key)) ||
+        descriptorByRepeatable.get(trimString(element.data_name)) ||
+        null;
       continue;
     }
 
@@ -136,86 +141,6 @@ const buildScopeFromElements = (elements) => {
   return scope;
 };
 
-const buildFieldReferenceMap = (schema) => {
-  const identityMap = buildFieldIdentityMap(schema);
-  const references = new Map();
-
-  Object.values(identityMap).forEach((field) => {
-    if (!isRecordObject(field)) {
-      return;
-    }
-
-    [field.field_id, field.output_key, field.key, field.data_name].forEach((ref) => {
-      const normalizedRef = trimString(ref);
-      if (normalizedRef && !references.has(normalizedRef)) {
-        references.set(normalizedRef, field.field_id);
-      }
-    });
-  });
-
-  return references;
-};
-
-const toTitlePart = (value) => {
-  if (Array.isArray(value)) {
-    const parts = value
-      .map((entry) => toTitlePart(entry))
-      .filter((entry) => typeof entry === 'string' && entry.length > 0);
-    return parts.length > 0 ? parts.join(', ') : null;
-  }
-
-  if (typeof value === 'number' || typeof value === 'boolean') {
-    return String(value);
-  }
-
-  if (typeof value === 'string') {
-    const normalized = value.trim();
-    return normalized.length > 0 ? normalized : null;
-  }
-
-  return null;
-};
-
-const computeStructuredRecordTitle = (schema, record) => {
-  const formNode = isRecordObject(schema?.form) ? schema.form : null;
-  const titleField = isRecordObject(formNode?.title_field) ? formNode.title_field : null;
-  const titleElements = Array.isArray(titleField?.elements) ? titleField.elements : [];
-
-  if (!titleField || titleField.enabled === false || titleElements.length === 0) {
-    return null;
-  }
-
-  const descriptors = buildDatasetDescriptors(schema);
-  const rootDescriptor =
-    descriptors.find((descriptor) => descriptor.id === ROOT_DATASET_ID) ?? descriptors[0] ?? null;
-  if (!rootDescriptor) {
-    return null;
-  }
-
-  const projected = projectDatasetRowValues(rootDescriptor, record);
-  const references = buildFieldReferenceMap(schema);
-  const parts = [];
-
-  titleElements.forEach((entry) => {
-    const normalizedEntry = trimString(entry);
-    if (!normalizedEntry) {
-      return;
-    }
-
-    const fieldId = references.get(normalizedEntry);
-    if (!fieldId) {
-      return;
-    }
-
-    const part = toTitlePart(projected.displayValues[fieldId]);
-    if (part) {
-      parts.push(part);
-    }
-  });
-
-  return parts.length > 0 ? parts.join(', ') : null;
-};
-
 const normalizeRecordScope = (record, scope) => {
   if (!isRecordObject(record)) {
     return record;
@@ -256,9 +181,43 @@ const normalizeRecordScope = (record, scope) => {
     });
   });
 
+  if (scope.datasetDescriptor) {
+    record['@title'] = resolveDatasetRowTitle(scope.datasetDescriptor, record);
+  }
+
   return record;
 };
 
+const findRepeatableElement = (elements, descriptor) => {
+  if (!Array.isArray(elements)) {
+    return null;
+  }
+
+  for (const element of elements) {
+    if (!isRecordObject(element)) {
+      continue;
+    }
+    if (
+      element.type === 'RepeatableSection' &&
+      [element.key, element.data_name].some(
+        (reference) =>
+          reference === descriptor.repeatable_field_id ||
+          reference === descriptor.repeatable_output_key
+      )
+    ) {
+      return element;
+    }
+    if (CONTAINER_TYPES.has(element.type) || element.type === 'RepeatableSection') {
+      const match = findRepeatableElement(element.elements, descriptor);
+      if (match) {
+        return match;
+      }
+    }
+  }
+
+  return null;
+};
+
 const buildSnapshotState = (formValues, scope) => {
   const rawValues = {};
   const repeatable = {};
@@ -360,14 +319,42 @@ export function normalizeStructuredRecord(schema, record, options = {}) {
   }
 
   const formNode = isRecordObject(schema?.form) ? schema.form : null;
-  const scope = buildScopeFromElements(Array.isArray(formNode?.elements) ? formNode.elements : []);
-
-  normalizeRecordScope(normalized, scope);
+  const descriptors = buildDatasetDescriptors(schema);
+  const descriptorByRepeatable = new Map();
+  descriptors.forEach((descriptor) => {
+    if (descriptor.kind !== 'repeatable') {
+      return;
+    }
+    [descriptor.repeatable_field_id, descriptor.repeatable_output_key].forEach((reference) => {
+      if (reference) {
+        descriptorByRepeatable.set(reference, descriptor);
+      }
+    });
+  });
 
-  if (formNode) {
-    normalized['@title'] = computeStructuredRecordTitle(schema, normalized);
+  const requestedDatasetId = trimString(options.datasetId) ?? ROOT_DATASET_ID;
+  const datasetDescriptor = descriptors.find((descriptor) => descriptor.id === requestedDatasetId);
+  if (!datasetDescriptor) {
+    throw new Error(`[form0] normalizeStructuredRecord: unknown dataset "${requestedDatasetId}"`);
   }
 
+  const datasetElement =
+    datasetDescriptor.kind === 'repeatable'
+      ? findRepeatableElement(formNode?.elements, datasetDescriptor)
+      : null;
+  const scopeElements =
+    datasetDescriptor.kind === 'root'
+      ? Array.isArray(formNode?.elements)
+        ? formNode.elements
+        : []
+      : Array.isArray(datasetElement?.elements)
+        ? datasetElement.elements
+        : [];
+  const scope = buildScopeFromElements(scopeElements, descriptorByRepeatable);
+  scope.datasetDescriptor = datasetDescriptor;
+
+  normalizeRecordScope(normalized, scope);
+
   return normalized;
 }
 

package/src/utilities/uuid.js

@@ -6,7 +6,8 @@
 
 function getRandomBytes(length) {
   const array = new Uint8Array(length);
-  const cryptoObj = (typeof globalThis !== 'undefined' && (globalThis.crypto || globalThis.msCrypto)) || null;
+  const cryptoObj =
+    (typeof globalThis !== 'undefined' && (globalThis.crypto || globalThis.msCrypto)) || null;
 
   if (cryptoObj && typeof cryptoObj.getRandomValues === 'function') {
     cryptoObj.getRandomValues(array);

package/scripts/legacy-postinstall-message.cjs

@@ -1,42 +0,0 @@
-// Legacy reference only.
-// This script is intentionally not wired into package.json lifecycle hooks.
-// It is retained as a reference for the previous install-time guidance message.
-
-const PACKAGE_NAME = 'form0-core';
-
-const npmUserAgent = process.env.npm_config_user_agent || '';
-const npmArgv = process.env.npm_config_argv;
-
-const isSupportedManager = /(npm|pnpm|yarn|bun)\//.test(npmUserAgent);
-
-const parseNpmArgv = (raw) => {
-  if (!raw) return null;
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-};
-
-const includesExplicitPackage = (argv) => {
-  if (!argv) return false;
-  const args = Array.isArray(argv.original) ? argv.original : argv.cooked || [];
-  return args.some(
-    (arg) => arg === PACKAGE_NAME || arg.startsWith(`${PACKAGE_NAME}@`),
-  );
-};
-
-if (isSupportedManager && includesExplicitPackage(parseNpmArgv(npmArgv))) {
-  // Keep message short to avoid noisy installs.
-  console.warn(
-    [
-      '',
-      'form0-core is the engine only.',
-      'For the full form0 ecosystem, install the CLI:',
-      '  npm install -g form0-cli',
-      'Docs: https://docs.form0.dev/getting-started/quickstart',
-      'If you are integrating the engine directly, you can ignore this warning.',
-      '',
-    ].join('\n'),
-  );
-}