@deterministic-code/datasources-cli 0.1.6 → 0.1.8

package/dist/generate/migrateUp.js

@@ -61,6 +61,9 @@ const applyMigrateUp = async (command, flags, deps, env = process.env) => {
       `migrate-up: provider ${provider} is not in backend.datasources (${dialects.join(", ") || "none"})`
     );
   const args = [
+    "--yes",
+    "--package",
+    "@deterministic-code/migraters",
     "migrate-up",
     "--provider",
     provider,

package/dist/migrateInit.js

@@ -2,7 +2,16 @@ const migrateProviders = ["sqlite", "postgres", "mysql", "sqlserver", "oracle"];
 const sqlMigrateProviders = (names) => migrateProviders.filter((name) => names.includes(name));
 const migrateInitCommands = (dialects) => dialects.length === 0 ? [] : [
   { command: "npm", args: ["install", "@deterministic-code/migraters"] },
-  { command: "npx", args: ["migrate-init", ...dialects.flatMap((name) => ["--dialect", name])] }
+  {
+    command: "npx",
+    args: [
+      "--yes",
+      "--package",
+      "@deterministic-code/migraters",
+      "migrate-init",
+      ...dialects.flatMap((name) => ["--dialect", name])
+    ]
+  }
 ];
 export {
   migrateInitCommands,

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

@@ -125,6 +125,12 @@ const isCsValueType = (csType) => {
   const t = csType.endsWith("?") ? csType.slice(0, -1) : csType;
   return CS_VALUE_TYPES.has(t.slice(t.lastIndexOf(".") + 1));
 };
+const csLanguageDefault = (csType) => {
+  if (csType.endsWith("?") || isCsValueType(csType)) return void 0;
+  if (csType === "string") return '""';
+  if (csType === "byte[]") return "[]";
+  return "default!";
+};
 const collectionDefaultExpr = (field) => {
   if (!field.isArray && field.isMap !== true) return void 0;
   if (field.isNullable && field.defaultValue === null) return void 0;
@@ -146,6 +152,7 @@ const nativeDefaultExpr = (specType, field) => {
 export {
   collectionDefaultExpr,
   convertSpecType,
+  csLanguageDefault,
   defaultValueConverter,
   isCsValueType,
   nativeDefaultExpr,

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

@@ -17,7 +17,7 @@ import {
 import {
   collectionDefaultExpr,
   convertSpecType,
-  isCsValueType,
+  csLanguageDefault,
   nativeDefaultExpr
 } from "./deterministic-type-converter.js";
 import { Emit } from "./emit.js";
@@ -42,11 +42,10 @@ class Generator extends Emit {
     const parent = classParent(table, "datasource", typesByName);
     const fields = declaredFields(table, "datasource", typesByName).map((f) => {
       const csType = csTypeFor(f, typesByName);
-      const initializer = collectionDefaultExpr(f) ?? nativeDefaultExpr(fieldTypeOf(f, typesByName), f);
+      const initializer = collectionDefaultExpr(f) ?? nativeDefaultExpr(fieldTypeOf(f, typesByName), f) ?? csLanguageDefault(csType);
       return {
         ident: this.casing.convertFields(f.name),
         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

@@ -20,7 +20,7 @@ import {
 import {
   collectionDefaultExpr,
   convertSpecType,
-  isCsValueType,
+  csLanguageDefault,
   nativeDefaultExpr
 } from "./deterministic-type-converter.js";
 import { Emit } from "./emit.js";
@@ -62,11 +62,10 @@ class Generator extends Emit {
     const parent = classParent(view, "view", typesByName);
     const fields = declaredFields(view, "view", typesByName).map((f) => {
       const csType = this.csTypeFor(f, typesByName);
-      const initializer = collectionDefaultExpr(f) ?? (f.kind === "primitive" ? nativeDefaultExpr(fieldTypeOf(f, typesByName), f) : void 0);
+      const initializer = collectionDefaultExpr(f) ?? (f.kind === "primitive" ? nativeDefaultExpr(fieldTypeOf(f, typesByName), f) : void 0) ?? csLanguageDefault(csType);
       return {
         ident: this.casing.convertFields(f.name),
         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-datasource-types/type.cs.tmpl

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

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

@@ -146,6 +146,14 @@ export const isCsValueType = (csType: string): boolean => {
   return CS_VALUE_TYPES.has(t.slice(t.lastIndexOf(".") + 1));
 };
 
+/** Language zero for a non-nullable reference type. Value types stay uninitialized. */
+export const csLanguageDefault = (csType: string): string | undefined => {
+  if (csType.endsWith("?") || isCsValueType(csType)) return undefined;
+  if (csType === "string") return '""';
+  if (csType === "byte[]") return "[]";
+  return "default!";
+};
+
 export const collectionDefaultExpr = (field: {
   isArray: boolean;
   isMap?: boolean;

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

@@ -21,7 +21,7 @@ import {
 import {
   collectionDefaultExpr,
   convertSpecType,
-  isCsValueType,
+  csLanguageDefault,
   nativeDefaultExpr,
 } from "./deterministic-type-converter.ts";
 import { Emit } from "./emit.ts";
@@ -53,11 +53,12 @@ class Generator extends Emit {
     const fields = declaredFields(table, "datasource", typesByName).map((f) => {
       const csType = csTypeFor(f, typesByName);
       const initializer =
-        collectionDefaultExpr(f) ?? nativeDefaultExpr(fieldTypeOf(f, typesByName), f);
+        collectionDefaultExpr(f) ??
+        nativeDefaultExpr(fieldTypeOf(f, typesByName), f) ??
+        csLanguageDefault(csType);
       return {
         ident: this.casing.convertFields(f.name),
         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

@@ -24,7 +24,7 @@ import {
 import {
   collectionDefaultExpr,
   convertSpecType,
-  isCsValueType,
+  csLanguageDefault,
   nativeDefaultExpr,
 } from "./deterministic-type-converter.ts";
 import { Emit } from "./emit.ts";
@@ -82,11 +82,11 @@ class Generator extends Emit {
         collectionDefaultExpr(f) ??
         (f.kind === "primitive"
           ? nativeDefaultExpr(fieldTypeOf(f, typesByName), f)
-          : undefined);
+          : undefined) ??
+        csLanguageDefault(csType);
       return {
         ident: this.casing.convertFields(f.name),
         csType,
-        required: !f.isNullable && initializer === undefined && !isCsValueType(csType),
         hasInitializer: initializer !== undefined,
         initializer: initializer ?? "",
       };

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 {{#required}}required {{/required}}{{csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
+    public {{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 {{#required}}required {{/required}}{{&csType}} {{ident}} { get; set; }{{#hasInitializer}} = {{&initializer}};{{/hasInitializer}}
+    public {{&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.6",
+  "version": "0.1.2",
   "type": "module",
   "exports": {
     ".": "./dist/generateSql.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "bin": {
     "datasources": "./bin/datasources.mjs"
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deterministic-code/datasources-code-generators": "0.1.6",
+    "@deterministic-code/datasources-code-generators": "0.1.2",
     "@deterministic-code/generators-common": "0.0.1",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/typescript-generators": "0.0.1",