@deterministic-code/datasources-cli 0.1.5 → 0.1.6

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.5",
+  "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.5",
-    "@deterministic-code/datasources-mysql": "^0.1.5",
-    "@deterministic-code/datasources-oracle": "^0.1.5",
-    "@deterministic-code/datasources-postgres": "^0.1.5",
-    "@deterministic-code/datasources-sqlite": "^0.1.5",
-    "@deterministic-code/datasources-sqlserver": "^0.1.5",
+    "@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-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/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.5",
+  "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.5",
+    "@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.5",
-    "@deterministic-code/datasources-sqlite": "^0.1.5",
-    "@deterministic-code/datasources-mysql": "^0.1.5",
-    "@deterministic-code/datasources-postgres": "^0.1.5",
-    "@deterministic-code/datasources-sqlserver": "^0.1.5",
-    "@deterministic-code/datasources-oracle": "^0.1.5",
+    "@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",