@jigx/sdk-tools 1.2.0-next.2 → 1.2.0-next.4

package/dist/migrator/nodes/screen.js

@@ -0,0 +1,403 @@
+import { isDeepStrictEqual } from 'node:util';
+import { ApplicationBuilder } from '@jigx/core-sdk';
+import { convertDatasourceDefinition } from '../converters/index.js';
+import { todoComment } from '../module-writer.js';
+import { isPlainObject } from '../normalize.js';
+import { countNodes } from '../report.js';
+import { lit, str } from '../ts-printer.js';
+import { attachNode, attachSpec } from './attach.js';
+import { firstLine, invoke, member, messageSlug, toJsonValue } from './builder-access.js';
+import { emitPlan, Gen } from './codegen.js';
+import { isNode, isNodeList } from './node-shape.js';
+import { PROBE_APP_NAME, replay } from './probe.js';
+/** Legacy screen type → `app.addScreen` factory. */
+const SCREEN_FACTORY = {
+    'jig.default': 'default',
+    'jig.list': 'list',
+    'jig.tabs': 'tabs',
+    'jig.full-screen': 'fullScreen',
+    'jig.document': 'document',
+    'jig.calendar': 'calendar',
+};
+/** Screen keys holding component or action nodes, attached through the node engine. */
+const SCREEN_SLOTS = [
+    'header',
+    'children',
+    'item',
+    'component',
+    'onFocus',
+    'onRefresh',
+    'onAppActivated',
+];
+/** Screen keys carried by the `app.addScreen.*` input. */
+const INPUT_KEYS = ['title', 'description', 'icon'];
+const PANEL_KEYS = ['children', 'numberOfVisibleActions', 'when', 'style'];
+const PANEL_STYLE_KEYS = ['isDisabled', 'isEssential', 'isDanger'];
+const INPUT_DEFINITION_KEYS = [
+    'type',
+    'required',
+    'default',
+    'value',
+    'description',
+];
+function createScreen(options) {
+    const { app, factory, input } = options;
+    return invoke(member(app, 'addScreen'), factory, [structuredClone(input)]);
+}
+function scratchScreen(factory, input) {
+    return () => createScreen({ app: new ApplicationBuilder({ name: PROBE_APP_NAME }), factory, input });
+}
+/** Whether the statements, applied to a scratch screen, build `key` exactly as the legacy value. */
+function verifiesKey(options) {
+    const { parentFactory, key, legacy, statements } = options;
+    try {
+        const screen = parentFactory();
+        for (const statement of statements)
+            statement.run(screen);
+        const built = invoke(screen, 'build', []);
+        return isDeepStrictEqual(toJsonValue(member(built, key)), toJsonValue(legacy));
+    }
+    catch {
+        return false;
+    }
+}
+function isExpressionValue(value) {
+    if (typeof value === 'string')
+        return value.startsWith('=');
+    return ((isPlainObject(value) || Array.isArray(value)) && countNodes({ value, asRoot: false }) === 0);
+}
+/** Candidate typed calls for a plain screen key, tried in order. */
+function keyCandidates(key, value) {
+    const candidates = [];
+    if (key === 'inputs' && isPlainObject(value)) {
+        const definitions = Object.entries(value);
+        const typed = definitions.every(([, definition]) => isPlainObject(definition) &&
+            Object.keys(definition).every((name) => INPUT_DEFINITION_KEYS.includes(name)));
+        if (typed) {
+            candidates.push(definitions.map(([name, definition]) => {
+                const { required, ...rest } = isPlainObject(definition) ? definition : {};
+                const input = {
+                    name,
+                    ...rest,
+                    ...(required === undefined ? {} : { isRequired: required }),
+                };
+                return {
+                    code: `screen.addInput(${lit(input, '  ')})`,
+                    run: (screen) => {
+                        invoke(screen, 'addInput', [structuredClone(input)]);
+                    },
+                };
+            }));
+        }
+    }
+    if (key === 'expressions' && isPlainObject(value)) {
+        const entries = Object.entries(value);
+        if (entries.every(([, expression]) => isExpressionValue(expression))) {
+            candidates.push(entries.map(([name, expression]) => ({
+                code: `screen.addExpression(${str(name)}, ${lit(expression, '  ')})`,
+                run: (screen) => {
+                    invoke(screen, 'addExpression', [name, structuredClone(expression)]);
+                },
+            })));
+        }
+    }
+    if (key === 'data' && typeof value === 'string') {
+        candidates.push([
+            {
+                code: `screen.data(${str(value)})`,
+                run: (screen) => {
+                    invoke(screen, 'data', [value]);
+                },
+            },
+        ]);
+    }
+    if (key === 'source' && isPlainObject(value)) {
+        const { documentType, ...rest } = value;
+        const method = documentType === 'PDF' ? 'pdf' : documentType === 'HTML' ? 'html' : undefined;
+        if (method) {
+            candidates.push([
+                {
+                    code: `screen.source.${method}(${lit(rest, '  ')})`,
+                    run: (screen) => {
+                        invoke(screen, `source.${method}`, [structuredClone(rest)]);
+                    },
+                },
+            ]);
+        }
+    }
+    if (countNodes({ value, asRoot: false }) === 0) {
+        const options = { [key]: value };
+        candidates.push([
+            {
+                code: `screen.with(${lit(options, '  ')})`,
+                run: (screen) => {
+                    invoke(screen, 'with', [structuredClone(options)]);
+                },
+            },
+        ]);
+    }
+    return candidates;
+}
+function keyGap(options) {
+    const { screenType, key, value } = options;
+    return {
+        gapId: `${screenType}:key-${key}`,
+        nodeType: screenType,
+        reason: `no typed screen call reproduces "${key}"`,
+        skippedNodes: countNodes({ value, asRoot: false }),
+        path: [key],
+    };
+}
+/** Splits a bottom-panel group into `screen.bottomPanel(input)` and its action list. */
+function panelSpec(group) {
+    if (!Object.keys(group).every((key) => PANEL_KEYS.includes(key)))
+        return undefined;
+    const { children, style, ...input } = group;
+    if (children !== undefined && !isNodeList(children))
+        return undefined;
+    if (style !== undefined) {
+        if (!isPlainObject(style))
+            return undefined;
+        if (!Object.keys(style).every((key) => PANEL_STYLE_KEYS.includes(key)))
+            return undefined;
+        Object.assign(input, style);
+    }
+    return { input, nodes: children ?? [] };
+}
+/**
+ * `jigs/<id>.jigx` → `app.addScreen.<type>({ screenId, title, … })` plus one typed call per
+ * screen key, verified on a scratch screen.
+ *
+ * Node slots (`children`, `item`, `header`, `onFocus`, …), the bottom panel and the
+ * summary go through the node engine, which skips unsupported nodes one by one. A
+ * plain key that does not verify is skipped as `jig.<type>:key-<key>`; an icon outside
+ * the SDK icon set as `jig:icon-<name>`.
+ */
+export function convertJig(entry) {
+    const { id, entity } = entry;
+    if (!isPlainObject(entity) || typeof entity.type !== 'string') {
+        return { type: 'skip', gapId: 'jigs:unsupported-shape', reason: 'a jig needs a string type' };
+    }
+    const screenType = entity.type;
+    const factory = SCREEN_FACTORY[screenType];
+    if (factory === undefined) {
+        return {
+            type: 'skip',
+            gapId: `${screenType}:no-screen-factory`,
+            nodeType: screenType,
+            reason: `app.addScreen has no factory for ${screenType}`,
+        };
+    }
+    let input = { screenId: id };
+    try {
+        scratchScreen(factory, input)();
+    }
+    catch (error) {
+        const line = firstLine(error);
+        return {
+            type: 'skip',
+            gapId: `${screenType}:throws-${messageSlug(line)}`,
+            nodeType: screenType,
+            reason: `app.addScreen.${factory} throws: ${line}`,
+        };
+    }
+    const gaps = [];
+    for (const key of INPUT_KEYS) {
+        if (!(key in entity))
+            continue;
+        const value = entity[key];
+        const candidate = { ...input, [key]: value };
+        if (verifiesKey({
+            parentFactory: scratchScreen(factory, candidate),
+            key,
+            legacy: value,
+            statements: [],
+        })) {
+            input = candidate;
+        }
+        else if (key === 'icon' && typeof value === 'string') {
+            gaps.push({
+                gapId: `jig:icon-${value}`,
+                nodeType: 'jig',
+                reason: `icon "${value}" is not in the SDK icon set`,
+                skippedNodes: 0,
+                path: [key],
+            });
+        }
+        else {
+            gaps.push(keyGap({ screenType, key, value }));
+        }
+    }
+    const screenInput = input;
+    const parentFactory = scratchScreen(factory, screenInput);
+    const gen = new Gen();
+    gen.push(`const screen = app.addScreen.${factory}(${lit(screenInput, gen.indent)})`);
+    for (const gap of gaps)
+        gen.push(todoComment(gap));
+    const ops = [];
+    const attached = (result) => {
+        if (result.type === 'skip') {
+            gaps.push(result.gap);
+            gen.push(todoComment(result.gap));
+            return;
+        }
+        gaps.push(...result.gaps);
+        const { plan } = result;
+        ops.push({
+            run: (screen) => {
+                replay({ parent: screen, plan });
+            },
+        });
+        emitPlan({ plan, parentExpr: 'screen', gen });
+    };
+    for (const [key, value] of Object.entries(entity)) {
+        if (key === 'type' || INPUT_KEYS.includes(key) || (key === 'jigId' && value === id))
+            continue;
+        if (SCREEN_SLOTS.includes(key) && (isNode(value) || isNodeList(value))) {
+            const list = Array.isArray(value);
+            const nodes = list ? value : [value];
+            nodes.forEach((node, index) => {
+                const path = list ? [key, index] : [key];
+                attached(attachNode({
+                    parentFactory,
+                    parentType: screenType,
+                    parentChildRoot: 'root',
+                    slot: key,
+                    list,
+                    path,
+                    node,
+                }));
+            });
+            continue;
+        }
+        if (key === 'summary' && isPlainObject(value) && isNode(value.children)) {
+            if (Object.keys(value).length === 1) {
+                attached(attachSpec({
+                    parentFactory,
+                    parentType: screenType,
+                    parentChildRoot: 'root',
+                    slot: 'summary',
+                    list: false,
+                    path: ['summary'],
+                    spec: {
+                        nodeType: 'jig-summary',
+                        input: undefined,
+                        calls: [],
+                        slots: [{ key: 'children', nodes: [value.children], list: false }],
+                        childRoot: 'root',
+                        legacy: value,
+                        accessor: { holder: 'summary' },
+                    },
+                }));
+                continue;
+            }
+        }
+        if (key === 'datasources' && isPlainObject(value) && Object.keys(value).length > 0) {
+            for (const [dsKey, datasource] of Object.entries(value)) {
+                const path = ['datasources', dsKey];
+                const result = convertDatasourceDefinition({
+                    key: dsKey,
+                    legacy: datasource,
+                    scope: 'screen',
+                });
+                if (result.type === 'skip') {
+                    const gap = {
+                        gapId: `jig:datasource-${result.slug}`,
+                        nodeType: 'jig',
+                        reason: result.reason,
+                        skippedNodes: countNodes({ value: datasource, asRoot: false }),
+                        path,
+                    };
+                    gaps.push(gap);
+                    gen.push(todoComment(gap));
+                    continue;
+                }
+                gen.push(result.code('screen'));
+                for (const { slug, reason, skippedNodes, path: inner } of result.gaps) {
+                    const gap = {
+                        gapId: `jig:datasource-${slug}`,
+                        nodeType: 'jig',
+                        reason,
+                        skippedNodes,
+                        path: [...path, ...inner],
+                    };
+                    gaps.push(gap);
+                    gen.push(todoComment(gap));
+                }
+                ops.push({
+                    run: (screen) => {
+                        result.attach(screen);
+                    },
+                });
+            }
+            continue;
+        }
+        const groups = Array.isArray(value) ? value : [];
+        if (key === 'actions' && groups.length > 0 && groups.every((group) => isPlainObject(group))) {
+            groups.forEach((group, index) => {
+                const path = ['actions', index];
+                const panel = isPlainObject(group) ? panelSpec(group) : undefined;
+                if (!panel) {
+                    const gap = {
+                        gapId: 'jig-actions:shape',
+                        nodeType: 'jig-actions',
+                        reason: 'the bottom panel group has keys screen.bottomPanel() does not take',
+                        skippedNodes: countNodes({ value: group, asRoot: false }),
+                        path,
+                    };
+                    gaps.push(gap);
+                    gen.push(todoComment(gap));
+                    return;
+                }
+                attached(attachSpec({
+                    parentFactory,
+                    parentType: screenType,
+                    parentChildRoot: 'root',
+                    slot: 'actions',
+                    list: true,
+                    path,
+                    spec: {
+                        nodeType: 'jig-actions',
+                        input: panel.input,
+                        calls: [],
+                        slots: panel.nodes.length > 0 ? [{ key: 'children', nodes: panel.nodes, list: true }] : [],
+                        childRoot: 'root',
+                        legacy: group,
+                        accessor: { holder: 'bottomPanel' },
+                    },
+                }));
+            });
+            continue;
+        }
+        const statements = keyCandidates(key, value).find((candidate) => verifiesKey({ parentFactory, key, legacy: value, statements: candidate }));
+        if (statements === undefined) {
+            const gap = keyGap({ screenType, key, value });
+            gaps.push(gap);
+            gen.push(todoComment(gap));
+            continue;
+        }
+        for (const statement of statements)
+            gen.push(statement.code);
+        ops.push({
+            run: (screen) => {
+                for (const statement of statements)
+                    statement.run(screen);
+            },
+        });
+    }
+    return {
+        type: 'statements',
+        gaps,
+        statements: [
+            {
+                code: gen.code(),
+                run: (app) => {
+                    const screen = createScreen({ app, factory, input: screenInput });
+                    for (const op of ops)
+                        op.run(screen);
+                },
+            },
+        ],
+    };
+}
+//# sourceMappingURL=screen.js.map

package/dist/migrator/nodes/screen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"screen.js","sourceRoot":"","sources":["../../../src/migrator/nodes/screen.ts"],"names":[],"mappings":"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"}

package/dist/migrator/normalize.d.ts

@@ -0,0 +1,42 @@
+import { type EntityKind, type FolderKind, type LegacyEntry } from './read-solution.js';
+/** Comparable form of an Application: `{ [kind]: { [id]: entity } }`, normalized for comparison. */
+export type ComparableApplication = Readonly<Partial<Record<EntityKind, Readonly<Record<string, unknown>>>>>;
+export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
+/** Recursively drops object entries whose value is `undefined`; arrays keep their order. */
+export declare function dropUndefined(value: unknown): unknown;
+/**
+ * Normalizes one folder-kind entity:
+ * - `$private` is dropped
+ * - the id field is dropped when it equals the file id
+ * - a datasource `instanceId` equal to its id is dropped
+ * - a jig's screen-scoped datasource `datasourceId`/`instanceId` equal to its key is dropped
+ * - a jig's empty `children` list and empty `datasources` map are dropped (screen builders
+ *   create them on the first entry, so a screen whose entries were all skipped builds without them)
+ * - a function's empty `parameters` map is dropped (REST function builders always emit one)
+ */
+export declare function normalizeEntity(options: {
+    readonly kind: FolderKind;
+    readonly id: string;
+    readonly entity: unknown;
+}): unknown;
+/**
+ * Converts a built (or assembled legacy) Application into its comparable form.
+ *
+ * Allowed differences, applied identically to both sides:
+ * - entity normalization (see `normalizeEntity`)
+ * - `runtimeSchemaVersion` and `$private` on the root
+ * - empty kind maps, and a `default` database without tables
+ * - `scripts.expressions` becomes the `scripts` kind
+ * - the remaining root keys become the single `index` entity
+ *
+ * Key order is ignored by the comparison; array order is significant.
+ */
+export declare function toComparable(application: Readonly<Record<string, unknown>>): ComparableApplication;
+/**
+ * Assembles legacy entries into the Application shape `ApplicationBuilder.build()` returns,
+ * so `toComparable` normalizes both sides through the same path.
+ *
+ * An asset file holds `{ [id]: value }`; it is unwrapped to `assets[id] = value`.
+ */
+export declare function assembleLegacy(entries: readonly LegacyEntry[]): Record<string, unknown>;
+//# sourceMappingURL=normalize.d.ts.map

package/dist/migrator/normalize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/migrator/normalize.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAA;AAE3B,oGAAoG;AACpG,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAC1C,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAC/D,CAAA;AAeD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE9E;AAMD,4FAA4F;AAC5F,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQrD;AAyBD;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CACzB,GAAG,OAAO,CA2BV;AAWD;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC7C,qBAAqB,CA+BvB;AAMD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BvF"}

package/dist/migrator/normalize.js

@@ -0,0 +1,167 @@
+import { FOLDER_KINDS, } from './read-solution.js';
+/** Field holding the entity id, per folder kind. Dropped when it equals the file id. */
+const ID_FIELD_BY_KIND = {
+    databases: 'databaseId',
+    datasources: 'datasourceId',
+    functions: 'functionId',
+    jigs: 'jigId',
+    components: 'componentId',
+    actions: 'actionId',
+};
+/** Root keys that never take part in the comparison. */
+const IGNORED_ROOT_KEYS = ['runtimeSchemaVersion', '$private'];
+export function isPlainObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function isEmptyMap(value) {
+    return isPlainObject(value) && Object.keys(value).length === 0;
+}
+/** Recursively drops object entries whose value is `undefined`; arrays keep their order. */
+export function dropUndefined(value) {
+    if (Array.isArray(value))
+        return value.map((item) => dropUndefined(item));
+    if (!isPlainObject(value))
+        return value;
+    const out = {};
+    for (const [name, item] of Object.entries(value)) {
+        if (item !== undefined)
+            out[name] = dropUndefined(item);
+    }
+    return out;
+}
+function withoutKeys(value, drop) {
+    return Object.fromEntries(Object.entries(value).filter(([name, item]) => !drop(name, item)));
+}
+/** Screen-scoped datasources: `datasourceId`/`instanceId` equal to the key is the runtime default. */
+function withoutDefaultDatasourceIds(datasources) {
+    const out = {};
+    for (const [name, datasource] of Object.entries(datasources)) {
+        out[name] = isPlainObject(datasource)
+            ? withoutKeys(datasource, (field, item) => (field === 'datasourceId' || field === 'instanceId') && item === name)
+            : datasource;
+    }
+    return out;
+}
+/**
+ * Normalizes one folder-kind entity:
+ * - `$private` is dropped
+ * - the id field is dropped when it equals the file id
+ * - a datasource `instanceId` equal to its id is dropped
+ * - a jig's screen-scoped datasource `datasourceId`/`instanceId` equal to its key is dropped
+ * - a jig's empty `children` list and empty `datasources` map are dropped (screen builders
+ *   create them on the first entry, so a screen whose entries were all skipped builds without them)
+ * - a function's empty `parameters` map is dropped (REST function builders always emit one)
+ */
+export function normalizeEntity(options) {
+    const { kind, id, entity } = options;
+    const value = dropUndefined(entity);
+    if (!isPlainObject(value))
+        return value;
+    const idField = ID_FIELD_BY_KIND[kind];
+    let out = withoutKeys(value, (field, item) => field === '$private' || (field === idField && item === id));
+    if (kind === 'datasources') {
+        out = withoutKeys(out, (field, item) => field === 'instanceId' && item === id);
+    }
+    if (kind === 'jigs' && isPlainObject(out.datasources)) {
+        out = { ...out, datasources: withoutDefaultDatasourceIds(out.datasources) };
+    }
+    if (kind === 'jigs') {
+        out = withoutKeys(out, (field, item) => (field === 'children' && Array.isArray(item) && item.length === 0) ||
+            (field === 'datasources' && isEmptyMap(item)));
+    }
+    if (kind === 'functions') {
+        out = withoutKeys(out, (field, item) => field === 'parameters' && isEmptyMap(item));
+    }
+    return out;
+}
+/** The `default` database with no tables is what every ApplicationBuilder starts with. */
+function isEmptyDefaultDatabase(id, entity) {
+    if (id !== 'default' || !isPlainObject(entity))
+        return false;
+    const { tables, ...rest } = entity;
+    const noTables = tables === undefined || (isPlainObject(tables) && Object.keys(tables).length === 0);
+    return noTables && Object.keys(rest).length === 0;
+}
+/**
+ * Converts a built (or assembled legacy) Application into its comparable form.
+ *
+ * Allowed differences, applied identically to both sides:
+ * - entity normalization (see `normalizeEntity`)
+ * - `runtimeSchemaVersion` and `$private` on the root
+ * - empty kind maps, and a `default` database without tables
+ * - `scripts.expressions` becomes the `scripts` kind
+ * - the remaining root keys become the single `index` entity
+ *
+ * Key order is ignored by the comparison; array order is significant.
+ */
+export function toComparable(application) {
+    const out = {};
+    const index = {};
+    for (const [name, value] of Object.entries(application)) {
+        if (value === undefined || IGNORED_ROOT_KEYS.includes(name))
+            continue;
+        const folderKind = FOLDER_KINDS.find((kind) => kind === name);
+        if (folderKind) {
+            if (!isPlainObject(value))
+                continue;
+            const entities = {};
+            for (const [id, entity] of Object.entries(value)) {
+                if (entity === null || entity === undefined)
+                    continue;
+                const normalized = normalizeEntity({ kind: folderKind, id, entity });
+                if (folderKind === 'databases' && isEmptyDefaultDatabase(id, normalized))
+                    continue;
+                entities[id] = normalized;
+            }
+            if (Object.keys(entities).length > 0)
+                out[folderKind] = entities;
+            continue;
+        }
+        if (name === 'scripts' && isPlainObject(value)) {
+            const expressions = value.expressions;
+            if (isPlainObject(expressions) && Object.keys(expressions).length > 0) {
+                out.scripts = { ...expressions };
+            }
+            continue;
+        }
+        index[name] = dropUndefined(value);
+    }
+    out.index = { index };
+    return out;
+}
+function isSingleKeyObject(value, name) {
+    return isPlainObject(value) && Object.keys(value).length === 1 && name in value;
+}
+/**
+ * Assembles legacy entries into the Application shape `ApplicationBuilder.build()` returns,
+ * so `toComparable` normalizes both sides through the same path.
+ *
+ * An asset file holds `{ [id]: value }`; it is unwrapped to `assets[id] = value`.
+ */
+export function assembleLegacy(entries) {
+    const application = {};
+    const kinds = {};
+    const expressions = {};
+    for (const entry of entries) {
+        if (entry.kind === 'index') {
+            if (isPlainObject(entry.entity))
+                Object.assign(application, entry.entity);
+            continue;
+        }
+        if (entry.kind === 'scripts') {
+            expressions[entry.id] = entry.entity;
+            continue;
+        }
+        const map = (kinds[entry.kind] ??= {});
+        map[entry.id] =
+            entry.kind === 'assets' && isSingleKeyObject(entry.entity, entry.id)
+                ? entry.entity[entry.id]
+                : entry.entity;
+    }
+    return {
+        ...application,
+        ...kinds,
+        ...(Object.keys(expressions).length > 0 ? { scripts: { expressions } } : {}),
+    };
+}
+//# sourceMappingURL=normalize.js.map

package/dist/migrator/normalize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../src/migrator/normalize.ts"],"names":[],"mappings":"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"}