@deterministic-code/datasources-cli 0.1.4 → 0.1.6

package/dist/generate/RepositoryPlan.js

@@ -1,6 +1,6 @@
 import { createCasingStrategy } from "@deterministic-code/generators-common/casing-strategy";
 import { createDatasourceNaming } from "@deterministic-code/generators-common/datasource-naming";
-import { identityColumns, isCollectionField, isDictionaryType, isOwnerIdentityRef, persistedColumnFields } from "@deterministic-code/generators-common/spec-types";
+import { identityColumns, isCollectionField, persistedColumnFields } from "@deterministic-code/generators-common/spec-types";
 const referenceOf = (references) => {
   if (references === void 0) return void 0;
   const [type, field] = [references].flat().join(".").split(".");
@@ -55,7 +55,7 @@ const planRepositories = (spec, dialect, settings) => {
     const tableType = expanded.get(table.name) ?? types.get(table.name) ?? full;
     const overlays = new Map(table.fields.map((field) => [field.name, field]));
     const projected = new Set(Object.values(authored.mapping ?? {}));
-    const columns = (isDictionaryType(tableType) ? persistedColumnFields(tableType, expanded) : tableType.fields).filter((field) => !isCollectionField(field) && !projected.has(field.name));
+    const columns = persistedColumnFields(tableType, expanded).filter((field) => !projected.has(field.name));
     return [
       {
         specName: authored.name,
@@ -101,16 +101,21 @@ const relations = (authored, full, casing, types, expanded, repoName, identity)
     if (!isCollectionField(field)) continue;
     if (field.isMap === true) {
       const dict = expanded.get(field.base) ?? types.get(field.base);
-      const owner = dict?.fields.find((item) => isOwnerIdentityRef(item.references, dict.name, expanded));
+      const owner = referenceOf(field.references);
       if (dict === void 0 || owner === void 0) continue;
-      const via = named(dict.name);
+      const via = named(owner.type);
       const value = dict.fields.find((item) => item.name === "value");
-      const nested = value === void 0 ? void 0 : expanded.get(value.base) ?? types.get(value.base);
+      const nested = value !== void 0 && value.kind === "type" && !value.isArray && value.isMap !== true ? expanded.get(value.base) ?? types.get(value.base) : void 0;
+      const roleColumn = (role) => {
+        const item = dict.fields.find((entry) => entry.name === role);
+        const ref2 = referenceOf(item?.references);
+        return ref2?.type === owner.type ? ref2.field : role;
+      };
       planned.push({
         destination: property(field.name),
         source,
-        relatedKey: property(owner.name),
-        relatedProperty: nested === void 0 ? property("value") : void 0,
+        relatedKey: property(owner.field),
+        relatedProperty: nested === void 0 ? property(roleColumn("value")) : void 0,
         kind: "dictionary",
         via: via.via,
         viaType: via.viaType

package/node_modules/@deterministic-code/csharp-generators/dist/deterministic-type-converter.js

@@ -105,8 +105,36 @@ const isCsZero = (specType, expr) => {
   if (CS_NUMERIC.has(native)) return /^0(\.0+)?$/.test(expr);
   return false;
 };
+const CS_VALUE_TYPES = /* @__PURE__ */ new Set([
+  "bool",
+  "byte",
+  "sbyte",
+  "short",
+  "ushort",
+  "int",
+  "uint",
+  "long",
+  "ulong",
+  "float",
+  "double",
+  "decimal",
+  "DateTime",
+  "Guid"
+]);
+const isCsValueType = (csType) => {
+  const t = csType.endsWith("?") ? csType.slice(0, -1) : csType;
+  return CS_VALUE_TYPES.has(t.slice(t.lastIndexOf(".") + 1));
+};
+const collectionDefaultExpr = (field) => {
+  if (!field.isArray && field.isMap !== true) return void 0;
+  if (field.isNullable && field.defaultValue === null) return void 0;
+  return "[]";
+};
 const nativeDefaultExpr = (specType, field) => {
   if (field.hasDefault !== true) return void 0;
+  if (field.defaultValue === null || Array.isArray(field.defaultValue) || typeof field.defaultValue === "object" && field.defaultValue !== null) {
+    return void 0;
+  }
   const expr = defaultValueConverter.convert(
     specType,
     String(field.defaultValue)
@@ -116,8 +144,10 @@ const nativeDefaultExpr = (specType, field) => {
   return isCsZero(specType, expr) ? void 0 : expr;
 };
 export {
+  collectionDefaultExpr,
   convertSpecType,
   defaultValueConverter,
+  isCsValueType,
   nativeDefaultExpr,
   toNative,
   typeConverter

package/node_modules/@deterministic-code/csharp-generators/dist/generate-datasource-types.js

@@ -15,7 +15,9 @@ import {
   withClassParents
 } from "./common/view-shape.js";
 import {
+  collectionDefaultExpr,
   convertSpecType,
+  isCsValueType,
   nativeDefaultExpr
 } from "./deterministic-type-converter.js";
 import { Emit } from "./emit.js";
@@ -39,10 +41,12 @@ class Generator extends Emit {
     const { schemaVersion, simpleDoc, descriptionDoc } = this.settings;
     const parent = classParent(table, "datasource", typesByName);
     const fields = declaredFields(table, "datasource", typesByName).map((f) => {
-      const initializer = nativeDefaultExpr(fieldTypeOf(f, typesByName), f);
+      const csType = csTypeFor(f, typesByName);
+      const initializer = collectionDefaultExpr(f) ?? nativeDefaultExpr(fieldTypeOf(f, typesByName), f);
       return {
         ident: this.casing.convertFields(f.name),
-        csType: csTypeFor(f, typesByName),
+        csType,
+        required: !f.isNullable && initializer === void 0 && !isCsValueType(csType),
         hasInitializer: initializer !== void 0,
         initializer: initializer ?? ""
       };

package/node_modules/@deterministic-code/csharp-generators/dist/generate-view-types.js

@@ -18,7 +18,9 @@ import {
   typeHasTag
 } from "./specification-parser.js";
 import {
+  collectionDefaultExpr,
   convertSpecType,
+  isCsValueType,
   nativeDefaultExpr
 } from "./deterministic-type-converter.js";
 import { Emit } from "./emit.js";
@@ -59,10 +61,12 @@ class Generator extends Emit {
     const isUnion = isUnionLike(view);
     const parent = classParent(view, "view", typesByName);
     const fields = declaredFields(view, "view", typesByName).map((f) => {
-      const initializer = f.kind === "primitive" ? nativeDefaultExpr(fieldTypeOf(f, typesByName), f) : void 0;
+      const csType = this.csTypeFor(f, typesByName);
+      const initializer = collectionDefaultExpr(f) ?? (f.kind === "primitive" ? nativeDefaultExpr(fieldTypeOf(f, typesByName), f) : void 0);
       return {
         ident: this.casing.convertFields(f.name),
-        csType: this.csTypeFor(f, typesByName),
+        csType,
+        required: !f.isNullable && initializer === void 0 && !isCsValueType(csType),
         hasInitializer: initializer !== void 0,
         initializer: initializer ?? ""
       };

package/node_modules/@deterministic-code/csharp-generators/dist/templates/create-backend-app/csharp/App/App.csproj.tmpl

@@ -6,6 +6,7 @@
     <AssemblyName>{{PROJECT_NAME}}</AssemblyName>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <!-- MigrateRunner/ (single-lang) and migrate/ (multi-lang) are sibling projects (see create-migrate-scripts.mjs); both excluded so the app's autoglob doesn't pull in their sources and trip on CS8802 (two top-level Program.cs) plus CS0234/CS0246 for MySqlConnector/Npgsql/Microsoft.Data (those packages are declared in MigrateRunner.csproj, not here). -->

package/node_modules/@deterministic-code/csharp-generators/dist/templates/create-datasource-types/type.cs.tmpl

@@ -10,6 +10,6 @@ namespace Backend.Types.Datasource;
 {{/descriptionDoc}}public class {{className}}{{#hasExtends}} : {{&extendsType}}{{/hasExtends}}
 {
 {{#fields}}
-    public {{csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
+    public {{#required}}required {{/required}}{{csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
 {{/fields}}
 }

package/node_modules/@deterministic-code/csharp-generators/dist/templates/create-view-types/type.cs.tmpl

@@ -15,6 +15,6 @@ namespace Backend.Types.View;
 {{/descriptionDoc}}public class {{className}}{{#hasExtends}} : {{&extendsType}}{{/hasExtends}}
 {
 {{#fields}}
-    public {{&csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
+    public {{#required}}required {{/required}}{{&csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
 {{/fields}}
 }

package/node_modules/@deterministic-code/csharp-generators/src/deterministic-type-converter.ts

@@ -124,16 +124,56 @@ const isCsZero = (specType: string, expr: string): boolean => {
   return false;
 };
 
+const CS_VALUE_TYPES = new Set([
+  "bool",
+  "byte",
+  "sbyte",
+  "short",
+  "ushort",
+  "int",
+  "uint",
+  "long",
+  "ulong",
+  "float",
+  "double",
+  "decimal",
+  "DateTime",
+  "Guid",
+]);
+
+export const isCsValueType = (csType: string): boolean => {
+  const t = csType.endsWith("?") ? csType.slice(0, -1) : csType;
+  return CS_VALUE_TYPES.has(t.slice(t.lastIndexOf(".") + 1));
+};
+
+export const collectionDefaultExpr = (field: {
+  isArray: boolean;
+  isMap?: boolean;
+  isNullable: boolean;
+  defaultValue?: string | number | boolean | null | readonly [] | object;
+}): string | undefined => {
+  if (!field.isArray && field.isMap !== true) return undefined;
+  if (field.isNullable && field.defaultValue === null) return undefined;
+  return "[]";
+};
+
 /** Native initializer, or `undefined` when absent or the language zero. */
 export const nativeDefaultExpr = (
   specType: string,
   field: {
     hasDefault?: boolean;
-    defaultValue?: string | number | boolean | null;
+    defaultValue?: string | number | boolean | null | readonly [] | object;
     isNullable: boolean;
   },
 ): string | undefined => {
   if (field.hasDefault !== true) return undefined;
+  if (
+    field.defaultValue === null ||
+    Array.isArray(field.defaultValue) ||
+    (typeof field.defaultValue === "object" && field.defaultValue !== null)
+  ) {
+    return undefined;
+  }
   const expr = defaultValueConverter.convert(
     specType,
     String(field.defaultValue),

package/node_modules/@deterministic-code/csharp-generators/src/generate-datasource-types.ts

@@ -19,7 +19,9 @@ import {
   withClassParents,
 } from "./common/view-shape.ts";
 import {
+  collectionDefaultExpr,
   convertSpecType,
+  isCsValueType,
   nativeDefaultExpr,
 } from "./deterministic-type-converter.ts";
 import { Emit } from "./emit.ts";
@@ -49,10 +51,13 @@ class Generator extends Emit {
     const { schemaVersion, simpleDoc, descriptionDoc } = this.settings;
     const parent = classParent(table, "datasource", typesByName);
     const fields = declaredFields(table, "datasource", typesByName).map((f) => {
-      const initializer = nativeDefaultExpr(fieldTypeOf(f, typesByName), f);
+      const csType = csTypeFor(f, typesByName);
+      const initializer =
+        collectionDefaultExpr(f) ?? nativeDefaultExpr(fieldTypeOf(f, typesByName), f);
       return {
         ident: this.casing.convertFields(f.name),
-        csType: csTypeFor(f, typesByName),
+        csType,
+        required: !f.isNullable && initializer === undefined && !isCsValueType(csType),
         hasInitializer: initializer !== undefined,
         initializer: initializer ?? "",
       };

package/node_modules/@deterministic-code/csharp-generators/src/generate-view-types.ts

@@ -22,7 +22,9 @@ import {
   type TypeField,
 } from "./specification-parser.ts";
 import {
+  collectionDefaultExpr,
   convertSpecType,
+  isCsValueType,
   nativeDefaultExpr,
 } from "./deterministic-type-converter.ts";
 import { Emit } from "./emit.ts";
@@ -75,13 +77,16 @@ class Generator extends Emit {
     const isUnion = isUnionLike(view);
     const parent = classParent(view, "view", typesByName);
     const fields = declaredFields(view, "view", typesByName).map((f) => {
+      const csType = this.csTypeFor(f, typesByName);
       const initializer =
-        f.kind === "primitive"
+        collectionDefaultExpr(f) ??
+        (f.kind === "primitive"
           ? nativeDefaultExpr(fieldTypeOf(f, typesByName), f)
-          : undefined;
+          : undefined);
       return {
         ident: this.casing.convertFields(f.name),
-        csType: this.csTypeFor(f, typesByName),
+        csType,
+        required: !f.isNullable && initializer === undefined && !isCsValueType(csType),
         hasInitializer: initializer !== undefined,
         initializer: initializer ?? "",
       };

package/node_modules/@deterministic-code/csharp-generators/src/templates/create-backend-app/csharp/App/App.csproj.tmpl

@@ -6,6 +6,7 @@
     <AssemblyName>{{PROJECT_NAME}}</AssemblyName>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <!-- MigrateRunner/ (single-lang) and migrate/ (multi-lang) are sibling projects (see create-migrate-scripts.mjs); both excluded so the app's autoglob doesn't pull in their sources and trip on CS8802 (two top-level Program.cs) plus CS0234/CS0246 for MySqlConnector/Npgsql/Microsoft.Data (those packages are declared in MigrateRunner.csproj, not here). -->

package/node_modules/@deterministic-code/csharp-generators/src/templates/create-datasource-types/type.cs.tmpl

@@ -10,6 +10,6 @@ namespace Backend.Types.Datasource;
 {{/descriptionDoc}}public class {{className}}{{#hasExtends}} : {{&extendsType}}{{/hasExtends}}
 {
 {{#fields}}
-    public {{csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
+    public {{#required}}required {{/required}}{{csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
 {{/fields}}
 }

package/node_modules/@deterministic-code/csharp-generators/src/templates/create-view-types/type.cs.tmpl

@@ -15,6 +15,6 @@ namespace Backend.Types.View;
 {{/descriptionDoc}}public class {{className}}{{#hasExtends}} : {{&extendsType}}{{/hasExtends}}
 {
 {{#fields}}
-    public {{&csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
+    public {{#required}}required {{/required}}{{&csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
 {{/fields}}
 }

package/node_modules/@deterministic-code/datasources-code-generators/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-code-generators",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "exports": {
     ".": "./dist/generateSql.js",
@@ -10,12 +10,12 @@
     "./sql/dialect-converters": "./dist/sql/dialect-converters.js"
   },
   "dependencies": {
-    "@deterministic-code/datasources": "^0.1.4",
-    "@deterministic-code/datasources-mysql": "^0.1.4",
-    "@deterministic-code/datasources-oracle": "^0.1.4",
-    "@deterministic-code/datasources-postgres": "^0.1.4",
-    "@deterministic-code/datasources-sqlite": "^0.1.4",
-    "@deterministic-code/datasources-sqlserver": "^0.1.4",
+    "@deterministic-code/datasources": "^0.1.6",
+    "@deterministic-code/datasources-mysql": "^0.1.6",
+    "@deterministic-code/datasources-oracle": "^0.1.6",
+    "@deterministic-code/datasources-postgres": "^0.1.6",
+    "@deterministic-code/datasources-sqlite": "^0.1.6",
+    "@deterministic-code/datasources-sqlserver": "^0.1.6",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/generators-common": "0.0.1",
     "pluralize": "^8.0.0",

package/node_modules/@deterministic-code/deterministic-generators-common/typescript/parser/dist/specification-parser.js

@@ -488,7 +488,10 @@ var isMap = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 var isString = (v) => typeof v === "string";
 var isFiniteNumber = (v) => typeof v === "number" && Number.isFinite(v);
 var isFiniteInt = (v) => isFiniteNumber(v) && Number.isInteger(v);
+var isEmptyList = (v) => Array.isArray(v) && v.length === 0;
+var isEmptyMap = (v) => isMap(v) && Object.keys(v).length === 0;
 var isLiteral = (v) => v === null || typeof v === "string" || typeof v === "number" || typeof v === "boolean";
+var isFieldDefault = (v) => isLiteral(v) || isEmptyList(v) || isEmptyMap(v);
 var yamlNode = (value, path = "$") => {
   const record = isMap(value) ? value : void 0;
   const at = (key) => record?.[key];
@@ -509,6 +512,7 @@ var yamlNode = (value, path = "$") => {
     finiteNumber: pick(isFiniteNumber),
     finiteInt: pick(isFiniteInt),
     literal: pick(isLiteral),
+    fieldDefault: pick(isFieldDefault),
     strings: (key) => {
       const v = at(key);
       return Array.isArray(v) ? v.filter(isString) : [];
@@ -614,7 +618,7 @@ var Parser = class {
   constructor(reader) {
     this.#reader = reader;
   }
-  async parse(settings, opts) {
+  async parse(_settings, opts) {
     const reader = this.#reader;
     const serviceClassName = opts?.serviceClassName ?? ((entity) => entity);
     const [hasTypes, hasDs, hasSeeds, hasServices, hasRoutes] = await Promise.all([
@@ -693,6 +697,7 @@ var Parser = class {
     const references = referencesOf(node);
     const size = sizeOf(node);
     const minSize = node.finiteInt("min_size");
+    const collectionDefault = parsed.isArray ? [] : parsed.isMap ? {} : void 0;
     return {
       name,
       type: rawType,
@@ -705,7 +710,7 @@ var Parser = class {
       ...size !== void 0 ? { size } : {},
       ...minSize !== void 0 ? { minSize } : {},
       ...references !== void 0 ? { references } : {},
-      ...node.has("default_value") ? { hasDefault: true, defaultValue: node.literal("default_value") } : {}
+      ...node.has("default_value") ? { hasDefault: true, defaultValue: node.fieldDefault("default_value") } : collectionDefault !== void 0 ? { hasDefault: true, defaultValue: collectionDefault } : {}
     };
   }
   #parseDatasource(yaml, types) {
@@ -1105,7 +1110,7 @@ var Parser = class {
       }
     }
   }
-  #extractCustomRoutes(root, dsByName, typeByName) {
+  #extractCustomRoutes(root, _dsByName, typeByName) {
     const customs = [];
     for (const entry of root.child("routes").items()) {
       if (entry.record === void 0) continue;

package/node_modules/@deterministic-code/deterministic-generators-common/typescript/parser/parser/specification-parser.ts

@@ -179,7 +179,7 @@ class Parser {
   }
 
   async parse(
-    settings: Record<string, string>,
+    _settings: Record<string, string>,
     opts?: { serviceClassName?: (entity: string) => string },
   ): Promise<IDeterministic> {
     const reader = this.#reader;
@@ -285,6 +285,7 @@ class Parser {
     const references = referencesOf(node);
     const size = sizeOf(node);
     const minSize = node.finiteInt("min_size");
+    const collectionDefault = parsed.isArray ? [] : parsed.isMap ? {} : undefined;
     return {
       name,
       type: rawType,
@@ -298,8 +299,10 @@ class Parser {
       ...(minSize !== undefined ? { minSize } : {}),
       ...(references !== undefined ? { references } : {}),
       ...(node.has("default_value")
-        ? { hasDefault: true, defaultValue: node.literal("default_value") }
-        : {}),
+        ? { hasDefault: true, defaultValue: node.fieldDefault("default_value") }
+        : collectionDefault !== undefined
+          ? { hasDefault: true, defaultValue: collectionDefault }
+          : {}),
     };
   }
 
@@ -838,7 +841,7 @@ class Parser {
 
   #extractCustomRoutes(
     root: YamlNode,
-    dsByName: Map<string, DatasourceTable>,
+    _dsByName: Map<string, DatasourceTable>,
     typeByName: Map<string, Type>,
   ): CustomRouteEntry[] {
     const customs: CustomRouteEntry[] = [];

package/node_modules/@deterministic-code/deterministic-generators-common/typescript/parser/specification.ts

@@ -21,7 +21,7 @@ export type TypeField = {
   minSize?: number;
   references?: string | [string, string];
   hasDefault?: boolean;
-  defaultValue?: string | number | boolean | null;
+  defaultValue?: string | number | boolean | null | object;
 };
 
 /** Primary label. `inherit` may also carry `union` — those members compose. */

package/node_modules/@deterministic-code/deterministic-generators-common/typescript/parser/yaml-node.ts

@@ -3,6 +3,7 @@ import { parse } from "yaml";
 type YamlLiteral = string | number | boolean | null;
 type YamlMap = { readonly [key: string]: YamlValue };
 type YamlValue = YamlLiteral | YamlValue[] | YamlMap;
+type FieldDefault = YamlLiteral | YamlValue[] | YamlMap;
 type Named = { name: string; node: YamlNode };
 
 const isMap = (v: YamlValue | undefined): v is YamlMap =>
@@ -16,12 +17,21 @@ const isFiniteNumber = (v: YamlValue | undefined): v is number =>
 const isFiniteInt = (v: YamlValue | undefined): v is number =>
   isFiniteNumber(v) && Number.isInteger(v);
 
+const isEmptyList = (v: YamlValue | undefined): v is YamlValue[] =>
+  Array.isArray(v) && v.length === 0;
+
+const isEmptyMap = (v: YamlValue | undefined): v is YamlMap =>
+  isMap(v) && Object.keys(v).length === 0;
+
 const isLiteral = (v: YamlValue | undefined): v is YamlLiteral =>
   v === null ||
   typeof v === "string" ||
   typeof v === "number" ||
   typeof v === "boolean";
 
+const isFieldDefault = (v: YamlValue | undefined): v is FieldDefault =>
+  isLiteral(v) || isEmptyList(v) || isEmptyMap(v);
+
 /** Typed cursor over a YAML value. Missing keys are empty nodes, not throws. */
 export type YamlNode = {
   readonly value: YamlValue | undefined;
@@ -34,6 +44,7 @@ export type YamlNode = {
   finiteNumber: (key: string) => number | undefined;
   finiteInt: (key: string) => number | undefined;
   literal: (key: string) => YamlLiteral | undefined;
+  fieldDefault: (key: string) => FieldDefault | undefined;
   strings: (key: string) => string[];
   items: () => YamlNode[];
   namedItems: () => Named[];
@@ -66,6 +77,7 @@ const yamlNode = (value: YamlValue | undefined, path = "$"): YamlNode => {
     finiteNumber: pick(isFiniteNumber),
     finiteInt: pick(isFiniteInt),
     literal: pick(isLiteral),
+    fieldDefault: pick(isFieldDefault),
     strings: (key) => {
       const v = at(key);
       return Array.isArray(v) ? v.filter(isString) : [];

package/node_modules/@deterministic-code/deterministic-specifications-typescript/typescript/parser/parser/specification-parser.ts

@@ -178,7 +178,7 @@ class Parser {
   }
 
   async parse(
-    settings: Record<string, string>,
+    _settings: Record<string, string>,
     opts?: { serviceClassName?: (entity: string) => string },
   ): Promise<IDeterministic> {
     const reader = this.#reader;
@@ -284,6 +284,7 @@ class Parser {
     const references = referencesOf(node);
     const size = sizeOf(node);
     const minSize = node.finiteInt("min_size");
+    const collectionDefault = parsed.isArray ? [] : parsed.isMap ? {} : undefined;
     return {
       name,
       type: rawType,
@@ -297,8 +298,10 @@ class Parser {
       ...(minSize !== undefined ? { minSize } : {}),
       ...(references !== undefined ? { references } : {}),
       ...(node.has("default_value")
-        ? { hasDefault: true, defaultValue: node.literal("default_value") }
-        : {}),
+        ? { hasDefault: true, defaultValue: node.fieldDefault("default_value") }
+        : collectionDefault !== undefined
+          ? { hasDefault: true, defaultValue: collectionDefault }
+          : {}),
     };
   }
 
@@ -837,7 +840,7 @@ class Parser {
 
   #extractCustomRoutes(
     root: YamlNode,
-    dsByName: Map<string, DatasourceTable>,
+    _dsByName: Map<string, DatasourceTable>,
     typeByName: Map<string, Type>,
   ): CustomRouteEntry[] {
     const customs: CustomRouteEntry[] = [];

package/node_modules/@deterministic-code/deterministic-specifications-typescript/typescript/parser/specification.ts

@@ -21,7 +21,7 @@ export type TypeField = {
   minSize?: number;
   references?: string | [string, string];
   hasDefault?: boolean;
-  defaultValue?: string | number | boolean | null;
+  defaultValue?: string | number | boolean | null | object;
 };
 
 /** Primary label. `inherit` may also carry `union` — those members compose. */

package/node_modules/@deterministic-code/deterministic-specifications-typescript/typescript/parser/yaml-node.ts

@@ -3,6 +3,7 @@ import { parse } from "yaml";
 type YamlLiteral = string | number | boolean | null;
 type YamlMap = { readonly [key: string]: YamlValue };
 type YamlValue = YamlLiteral | YamlValue[] | YamlMap;
+type FieldDefault = YamlLiteral | YamlValue[] | YamlMap;
 type Named = { name: string; node: YamlNode };
 
 const isMap = (v: YamlValue | undefined): v is YamlMap =>
@@ -16,12 +17,21 @@ const isFiniteNumber = (v: YamlValue | undefined): v is number =>
 const isFiniteInt = (v: YamlValue | undefined): v is number =>
   isFiniteNumber(v) && Number.isInteger(v);
 
+const isEmptyList = (v: YamlValue | undefined): v is YamlValue[] =>
+  Array.isArray(v) && v.length === 0;
+
+const isEmptyMap = (v: YamlValue | undefined): v is YamlMap =>
+  isMap(v) && Object.keys(v).length === 0;
+
 const isLiteral = (v: YamlValue | undefined): v is YamlLiteral =>
   v === null ||
   typeof v === "string" ||
   typeof v === "number" ||
   typeof v === "boolean";
 
+const isFieldDefault = (v: YamlValue | undefined): v is FieldDefault =>
+  isLiteral(v) || isEmptyList(v) || isEmptyMap(v);
+
 /** Typed cursor over a YAML value. Missing keys are empty nodes, not throws. */
 export type YamlNode = {
   readonly value: YamlValue | undefined;
@@ -34,6 +44,7 @@ export type YamlNode = {
   finiteNumber: (key: string) => number | undefined;
   finiteInt: (key: string) => number | undefined;
   literal: (key: string) => YamlLiteral | undefined;
+  fieldDefault: (key: string) => FieldDefault | undefined;
   strings: (key: string) => string[];
   items: () => YamlNode[];
   namedItems: () => Named[];
@@ -66,6 +77,7 @@ const yamlNode = (value: YamlValue | undefined, path = "$"): YamlNode => {
     finiteNumber: pick(isFiniteNumber),
     finiteInt: pick(isFiniteInt),
     literal: pick(isLiteral),
+    fieldDefault: pick(isFieldDefault),
     strings: (key) => {
       const v = at(key);
       return Array.isArray(v) ? v.filter(isString) : [];

package/node_modules/@deterministic-code/generators-common/dist/spec-types.d.ts

@@ -32,6 +32,6 @@ export declare const dictionaryEntryFields: (dict: Type) => {
     value: TypeField;
 } | undefined;
 export declare const dictionaryOfField: (field: TypeField, byName: Map<string, Type>) => Type | undefined;
-export declare const persistedColumnFields: (type: Type, byName: Map<string, Type>) => TypeField[];
+export declare const persistedColumnFields: (type: Type, _byName?: Map<string, Type>) => TypeField[];
 export declare const dictionaryUniqueColumns: (type: Type, byName: Map<string, Type>) => string[];
 export {};

package/node_modules/@deterministic-code/generators-common/dist/spec-types.js

@@ -112,23 +112,31 @@ const dictionaryOfField = (field, byName) => {
   const dict = byName.get(field.base);
   return isDictionaryType(dict) ? dict : void 0;
 };
-const persistedColumnFields = (type, byName) => {
-  if (!isDictionaryType(type)) return columnFields(type.fields);
-  const value = type.fields.find((f) => f.name === "value");
-  if (value === void 0 || value.kind !== "type" || value.isArray || value.isMap === true) {
-    return columnFields(type.fields);
+const persistedColumnFields = (type, _byName) => columnFields(type.fields);
+const roleColumn = (dict, role, tableName) => {
+  const field = dict.fields.find((item) => item.name === role);
+  const references = field?.references;
+  if (typeof references === "string") {
+    const [table, column] = references.split(".");
+    if (table === tableName && column !== void 0 && column.length > 0) {
+      return column;
+    }
   }
-  const nested = byName.get(value.base);
-  if (nested === void 0) return columnFields(type.fields);
-  return [
-    ...columnFields(type.fields.filter((f) => f.name !== "value")),
-    ...columnFields(nested.fields)
-  ];
+  return role;
 };
 const dictionaryUniqueColumns = (type, byName) => {
-  if (!isDictionaryType(type)) return [];
-  const owners = type.fields.filter((f) => isOwnerIdentityRef(f.references, type.name, byName)).map((f) => f.name);
-  return type.fields.some((f) => f.name === "key") ? [...owners, "key"] : owners;
+  for (const candidate of byName.values()) {
+    for (const field of candidate.fields) {
+      if (field.isMap !== true) continue;
+      const dict = byName.get(field.base);
+      if (!isDictionaryType(dict) || dict === void 0) continue;
+      if (typeof field.references !== "string") continue;
+      const [table, owner] = field.references.split(".");
+      if (table !== type.name || owner === void 0 || owner.length === 0) continue;
+      return [owner, roleColumn(dict, "key", type.name)];
+    }
+  }
+  return [];
 };
 export {
   DATASOURCE_SEEDS_YAML,

package/node_modules/@deterministic-code/generators-common/src/spec-types.ts

@@ -202,33 +202,35 @@ export const dictionaryOfField = (
 
 export const persistedColumnFields = (
   type: Type,
-  byName: Map<string, Type>,
-): TypeField[] => {
-  if (!isDictionaryType(type)) return columnFields(type.fields);
-  const value = type.fields.find((f) => f.name === "value");
-  if (
-    value === undefined ||
-    value.kind !== "type" ||
-    value.isArray ||
-    value.isMap === true
-  ) {
-    return columnFields(type.fields);
+  _byName?: Map<string, Type>,
+): TypeField[] => columnFields(type.fields);
+
+const roleColumn = (dict: Type, role: string, tableName: string): string => {
+  const field = dict.fields.find((item) => item.name === role);
+  const references = field?.references;
+  if (typeof references === "string") {
+    const [table, column] = references.split(".");
+    if (table === tableName && column !== undefined && column.length > 0) {
+      return column;
+    }
   }
-  const nested = byName.get(value.base);
-  if (nested === undefined) return columnFields(type.fields);
-  return [
-    ...columnFields(type.fields.filter((f) => f.name !== "value")),
-    ...columnFields(nested.fields),
-  ];
+  return role;
 };
 
 export const dictionaryUniqueColumns = (
   type: Type,
   byName: Map<string, Type>,
 ): string[] => {
-  if (!isDictionaryType(type)) return [];
-  const owners = type.fields
-    .filter((f) => isOwnerIdentityRef(f.references, type.name, byName))
-    .map((f) => f.name);
-  return type.fields.some((f) => f.name === "key") ? [...owners, "key"] : owners;
+  for (const candidate of byName.values()) {
+    for (const field of candidate.fields) {
+      if (field.isMap !== true) continue;
+      const dict = byName.get(field.base);
+      if (!isDictionaryType(dict) || dict === undefined) continue;
+      if (typeof field.references !== "string") continue;
+      const [table, owner] = field.references.split(".");
+      if (table !== type.name || owner === undefined || owner.length === 0) continue;
+      return [owner, roleColumn(dict, "key", type.name)];
+    }
+  }
+  return [];
 };

package/node_modules/@deterministic-code/rust-generators/dist/deterministic-type-converter.js

@@ -101,6 +101,9 @@ const convertSpecType = toNative;
 const isRustZeroExpr = (expr) => expr === "false" || expr === "0" || expr === "0.0" || expr === "String::new()" || expr === 'String::from("")' || expr === "vec![]" || expr === "None";
 const rustSpecDefaultExpr = (specType, field) => {
   if (field.hasDefault !== true) return void 0;
+  if (field.defaultValue === null || Array.isArray(field.defaultValue) || typeof field.defaultValue === "object" && field.defaultValue !== null) {
+    return void 0;
+  }
   const expr = defaultValueConverter.convert(
     specType,
     String(field.defaultValue)

package/node_modules/@deterministic-code/rust-generators/dist/generate-view-types.js

@@ -68,7 +68,7 @@ class Generator extends Emit {
   }
   fieldToken(field) {
     const rustType = this.rustTypeFor(field);
-    const specExpr = field.kind === "primitive" ? rustSpecDefaultExpr(fieldTypeOf(field, this.typesByName), field) : void 0;
+    const specExpr = field.isArray || field.isMap === true ? void 0 : field.kind === "primitive" ? rustSpecDefaultExpr(fieldTypeOf(field, this.typesByName), field) : void 0;
     return {
       ident: this.casing.convertFields(field.name),
       rustType,

package/node_modules/@deterministic-code/rust-generators/src/deterministic-type-converter.ts

@@ -130,11 +130,18 @@ export const rustSpecDefaultExpr = (
   specType: string,
   field: {
     hasDefault?: boolean;
-    defaultValue?: string | number | boolean | null;
+    defaultValue?: string | number | boolean | null | readonly [] | object;
     isNullable: boolean;
   },
 ): string | undefined => {
   if (field.hasDefault !== true) return undefined;
+  if (
+    field.defaultValue === null ||
+    Array.isArray(field.defaultValue) ||
+    (typeof field.defaultValue === "object" && field.defaultValue !== null)
+  ) {
+    return undefined;
+  }
   const expr = defaultValueConverter.convert(
     specType,
     String(field.defaultValue),

package/node_modules/@deterministic-code/rust-generators/src/generate-view-types.ts

@@ -83,9 +83,11 @@ class Generator extends Emit {
   private fieldToken(field: TypeField) {
     const rustType = this.rustTypeFor(field);
     const specExpr =
-      field.kind === "primitive"
-        ? rustSpecDefaultExpr(fieldTypeOf(field, this.typesByName), field)
-        : undefined;
+      field.isArray || field.isMap === true
+        ? undefined
+        : field.kind === "primitive"
+          ? rustSpecDefaultExpr(fieldTypeOf(field, this.typesByName), field)
+          : undefined;
     return {
       ident: this.casing.convertFields(field.name),
       rustType,

package/node_modules/@deterministic-code/typescript-generators/dist/deterministic-type-converter.js

@@ -92,8 +92,16 @@ const defaultValueConverter = new DeterministicDefaultValueConverter({
 });
 const toNative = (specType) => typeConverter.convert(specType);
 const isTsZeroExpr = (expr) => expr === "false" || expr === "0" || expr === '""';
+const collectionDefaultExpr = (field) => {
+  if (!field.isArray && field.isMap !== true) return void 0;
+  if (field.isNullable && field.defaultValue === null) return void 0;
+  return field.isMap === true ? "{}" : "[]";
+};
 const nativeDefaultExpr = (specType, field) => {
   if (field.hasDefault !== true) return void 0;
+  if (field.defaultValue === null || Array.isArray(field.defaultValue) || typeof field.defaultValue === "object" && field.defaultValue !== null) {
+    return void 0;
+  }
   const expr = defaultValueConverter.convert(
     specType,
     String(field.defaultValue)
@@ -103,6 +111,7 @@ const nativeDefaultExpr = (specType, field) => {
   return isTsZeroExpr(expr) ? void 0 : expr;
 };
 export {
+  collectionDefaultExpr,
   defaultValueConverter,
   nativeDefaultExpr,
   toNative,

package/node_modules/@deterministic-code/typescript-generators/dist/emit-shaped-types.js

@@ -17,7 +17,11 @@ import {
 import {
   DeterministicParser
 } from "@deterministic-code/deterministic-generators-common/parser";
-import { nativeDefaultExpr, toNative } from "./deterministic-type-converter.js";
+import {
+  collectionDefaultExpr,
+  nativeDefaultExpr,
+  toNative
+} from "./deterministic-type-converter.js";
 import { fieldRefKind, fieldsBeyondParent, isAlias } from "./common/view-shape.js";
 import { bag, Emit } from "./emit.js";
 import {
@@ -277,14 +281,14 @@ class Generator extends Emit {
     const parent = flatten ? void 0 : this.extendsType(type, aliasByClass);
     const fields = this.emitFields(type, expanded, flatten);
     const fieldTokens = fields.map((f) => {
-      const initializer = f.kind === "primitive" ? nativeDefaultExpr(fieldTypeOf(f, this.typesByName), f) : void 0;
+      const initializer = collectionDefaultExpr(f) ?? (f.kind === "primitive" ? nativeDefaultExpr(fieldTypeOf(f, this.typesByName), f) : void 0);
       return {
         ident: this.casing.fieldIdent(f.name),
         tsType: this.fieldTs(f, aliasByClass),
         nullable: f.isNullable,
         hasInitializer: isClass && initializer !== void 0,
         initializer: initializer ?? "",
-        definite: isClass && initializer === void 0
+        definite: isClass && initializer === void 0 && !f.isNullable
       };
     });
     const refs = this.refs(type, expanded, flatten);

package/node_modules/@deterministic-code/typescript-generators/src/deterministic-type-converter.ts

@@ -114,16 +114,34 @@ export const toNative = (specType: string): string =>
 const isTsZeroExpr = (expr: string): boolean =>
   expr === "false" || expr === "0" || expr === '""';
 
+export const collectionDefaultExpr = (field: {
+  isArray: boolean;
+  isMap?: boolean;
+  isNullable: boolean;
+  defaultValue?: string | number | boolean | null | readonly [] | object;
+}): string | undefined => {
+  if (!field.isArray && field.isMap !== true) return undefined;
+  if (field.isNullable && field.defaultValue === null) return undefined;
+  return field.isMap === true ? "{}" : "[]";
+};
+
 /** Native initializer, or `undefined` when absent or the language zero. */
 export const nativeDefaultExpr = (
   specType: string,
   field: {
     hasDefault?: boolean;
-    defaultValue?: string | number | boolean | null;
+    defaultValue?: string | number | boolean | null | readonly [] | object;
     isNullable: boolean;
   },
 ): string | undefined => {
   if (field.hasDefault !== true) return undefined;
+  if (
+    field.defaultValue === null ||
+    Array.isArray(field.defaultValue) ||
+    (typeof field.defaultValue === "object" && field.defaultValue !== null)
+  ) {
+    return undefined;
+  }
   const expr = defaultValueConverter.convert(
     specType,
     String(field.defaultValue),

package/node_modules/@deterministic-code/typescript-generators/src/emit-shaped-types.ts

@@ -21,7 +21,11 @@ import {
   type Type,
   type TypeField,
 } from "@deterministic-code/deterministic-generators-common/parser";
-import { nativeDefaultExpr, toNative } from "./deterministic-type-converter.ts";
+import {
+  collectionDefaultExpr,
+  nativeDefaultExpr,
+  toNative,
+} from "./deterministic-type-converter.ts";
 import { fieldRefKind, fieldsBeyondParent, isAlias } from "./common/view-shape.ts";
 import { bag, Emit } from "./emit.ts";
 import {
@@ -457,16 +461,17 @@ class Generator extends Emit {
     const fields = this.emitFields(type, expanded, flatten);
     const fieldTokens = fields.map((f) => {
       const initializer =
-        f.kind === "primitive"
+        collectionDefaultExpr(f) ??
+        (f.kind === "primitive"
           ? nativeDefaultExpr(fieldTypeOf(f, this.typesByName), f)
-          : undefined;
+          : undefined);
       return {
         ident: this.casing.fieldIdent(f.name),
         tsType: this.fieldTs(f, aliasByClass),
         nullable: f.isNullable,
         hasInitializer: isClass && initializer !== undefined,
         initializer: initializer ?? "",
-        definite: isClass && initializer === undefined,
+        definite: isClass && initializer === undefined && !f.isNullable,
       };
     });
     const refs = this.refs(type, expanded, flatten);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "bin": {
     "datasources": "./bin/datasources.mjs"
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deterministic-code/datasources-code-generators": "0.1.4",
+    "@deterministic-code/datasources-code-generators": "0.1.6",
     "@deterministic-code/generators-common": "0.0.1",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/typescript-generators": "0.0.1",
@@ -21,12 +21,12 @@
     "@deterministic-code/rust-generators": "0.0.1",
     "@deterministic-code/generators-openapi": "0.0.1",
     "@deterministic-code/patch-merger": "0.1.0",
-    "@deterministic-code/datasources": "^0.1.4",
-    "@deterministic-code/datasources-sqlite": "^0.1.4",
-    "@deterministic-code/datasources-mysql": "^0.1.4",
-    "@deterministic-code/datasources-postgres": "^0.1.4",
-    "@deterministic-code/datasources-sqlserver": "^0.1.4",
-    "@deterministic-code/datasources-oracle": "^0.1.4",
+    "@deterministic-code/datasources": "^0.1.6",
+    "@deterministic-code/datasources-sqlite": "^0.1.6",
+    "@deterministic-code/datasources-mysql": "^0.1.6",
+    "@deterministic-code/datasources-postgres": "^0.1.6",
+    "@deterministic-code/datasources-sqlserver": "^0.1.6",
+    "@deterministic-code/datasources-oracle": "^0.1.6",
     "@inquirer/prompts": "^7.8.0",
     "yaml": "^2.6.0",
     "mustache": "^4.2.0",