@deterministic-code/datasources-cli 0.1.16 → 0.1.17

package/dist/generate/RepositoryPlan.js

@@ -3,6 +3,7 @@ import { inferReferenceFieldTypes } from "@deterministic-code/datasources-code-g
 import { createCasingStrategy } from "@deterministic-code/generators-common/casing-strategy";
 import { identityColumns, isCollectionField, persistedColumnFields } from "@deterministic-code/generators-common/spec-types";
 import { writeInclusionOf } from "@deterministic-code/datasources-code-generators/sql/common/write-inclusion";
+const createZeroKind = (field) => field.isId === true || field.references !== void 0 || field.isNullable === true || field.defaultValue !== void 0 && field.defaultValue !== null ? void 0 : field.type === "boolean" ? "boolean" : field.type === "string" ? "string" : void 0;
 const referenceOf = (references) => {
   if (references === void 0) return void 0;
   const [type, field] = [references].flat().join(".").split(".");
@@ -80,6 +81,12 @@ const planRepositories = (spec, dialect, settings) => {
         createProperties: columns.filter(
           (field) => writeInclusionOf(field, identityColumns(tableType, table), overlays.get(field.name)).includeInCreate
         ).map((field) => property(field.name)),
+        createZeros: columns.flatMap((field) => {
+          if (!writeInclusionOf(field, identityColumns(tableType, table), overlays.get(field.name)).includeInCreate)
+            return [];
+          const kind = createZeroKind(field);
+          return kind === void 0 ? [] : [{ name: property(field.name), kind }];
+        }),
         updateProperties: columns.filter(
           (field) => writeInclusionOf(field, identityColumns(tableType, table), overlays.get(field.name)).includeInUpdate
         ).map((field) => property(field.name)),

package/dist/generate/RustRepositories.js

@@ -3,9 +3,17 @@ import { content } from "@deterministic-code/generators-common/generate-entry";
 import { childField, children as childModels, isLinked, pluralSnake, registryFile, repositoryFile, rustIdent, rustModLine } from "./RepositoryModel.js";
 import { dialectsOf, pad, quote, writeList } from "./writeLists.js";
 const rustString = (value) => `"${quote(value)}"`;
-const uses = (model) => dialectsOf(model).length === 0 ? `use datasources::{Association, Connection, CRUDRepository, CRUDRepositoryOptions, DictionaryMapper, Enrichment, EnrichmentPropertyType, ICRUDRepository, ReadonlyRepository, ReadonlyRepositoryMappingOptions, Result};
-use std::sync::Arc;` : `use datasources::{Association, Connection, CRUDRepository, CRUDRepositoryBuilder, CRUDRepositoryOptions, DictionaryMapper, Enrichment, EnrichmentPropertyType, ICRUDRepository, ReadonlyRepository, ReadonlyRepositoryMappingOptions, Result};
+const uses = (model) => {
+  const builder = dialectsOf(model).length === 0 ? "" : "CRUDRepositoryBuilder, ";
+  const value = model.createZeros.length === 0 ? "" : "Value, ";
+  return `use datasources::{Association, Connection, CRUDRepository, ${builder}CRUDRepositoryOptions, DictionaryMapper, Enrichment, EnrichmentPropertyType, ICRUDRepository, ReadonlyRepository, ReadonlyRepositoryMappingOptions, ${value}Result};
 use std::sync::Arc;`;
+};
+const rustZeros = (zeros) => zeros.length === 0 ? "" : `.map(|repo| repo.with_create_zeros([
+${zeros.map(
+  (zero) => zero.kind === "boolean" ? `        (${rustString(zero.name)}.into(), Value::from(false)),` : `        (${rustString(zero.name)}.into(), Value::from("")),`
+).join("\n")}
+    ].into_iter().collect()))`;
 const rustFill = (model) => {
   const mapping = model.propertyMappings.length === 0 ? "" : `options.property_mappings = Some(Arc::new(DictionaryMapper::new([
 ${model.propertyMappings.map((pair) => `    (${rustString(pair.from)}.into(), ${rustString(pair.to)}.into()),`).join("\n")}
@@ -191,7 +199,7 @@ const plain = (model, nested, casing) => `${uses(model)}
 
 pub fn ${repoFn(model.specName, casing)}(connection: Arc<dyn Connection>) -> Result<CRUDRepository> {
 ${crudOptions(model)}
-    CRUDRepository::new(connection, options)
+    CRUDRepository::new(connection, options)${rustZeros(model.createZeros)}
 }
 
 ${readonlyFn(model, nested, casing)}
@@ -218,7 +226,7 @@ impl ${type} {
     pub fn new(connection: Arc<dyn Connection>) -> Result<Self> {
 ${pad(crudOptions(model), 4)}
 ${childLets(children, nested, casing)}
-        let mut repo = CRUDRepository::new(Arc::clone(&connection), options)?;
+        let mut repo = CRUDRepository::new(Arc::clone(&connection), options)${rustZeros(model.createZeros)}?;
 ${enrich}
         Ok(Self { repo: Arc::new(repo), ${assign} })
     }

package/dist/generate/TypeScriptRepositories.js

@@ -10,6 +10,8 @@ const entityAndMapping = (model) => {
 const tsOptions = (model) => `{ ${entityAndMapping(model)}ids: ${writeList("typescript", model.ids)}, createProperties: ${writeList("typescript", model.createProperties)}, updateProperties: ${writeList("typescript", model.updateProperties)}, readProperties: ${writeList("typescript", model.readProperties)} }`;
 const tsReadonly = (model) => `{ ${entityAndMapping(model)}readProperties: ${writeList("typescript", model.readProperties)} }`;
 const tsOptionsExpr = (model) => dialectsOf(model).length === 0 ? tsOptions(model) : "options(connection)";
+const tsZeros = (model) => model.createZeros.length === 0 ? "" : `    this.createZeros = { ${model.createZeros.map((zero) => `${zero.name}: ${zero.kind === "boolean" ? "false" : '""'}`).join(", ")} };
+`;
 const tsBuilder = (name, model, write) => `const ${name} = (connection: IConnection) =>
   new CRUDRepositoryBuilder<${model.typeName}>()
     .add(${write(model)})${dialectsOf(model).map(([engine, planned]) => `
@@ -96,7 +98,7 @@ ${tsOptionsFn(model)}export class ${model.typeName}Repository extends CRUDReposi
 ${fields.length === 0 ? "" : `${fields.join("\n")}
 `}  constructor(connection: IConnection) {
     super(connection, ${tsOptionsExpr(model)});
-${wrap}${lines.length === 0 ? "" : `${lines.join("\n")}
+${tsZeros(model)}${wrap}${lines.length === 0 ? "" : `${lines.join("\n")}
 `}  }
 ${createReadonly(model, casing)}
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-code-generators",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "type": "module",
   "exports": {
     ".": "./dist/generateSql.js",
@@ -14,12 +14,12 @@
     "./sql/common/infer-reference-types": "./dist/sql/common/infer-reference-types.js"
   },
   "dependencies": {
-    "@deterministic-code/datasources": "^0.1.14",
-    "@deterministic-code/datasources-mysql": "^0.1.14",
-    "@deterministic-code/datasources-oracle": "^0.1.14",
-    "@deterministic-code/datasources-postgres": "^0.1.14",
-    "@deterministic-code/datasources-sqlite": "^0.1.14",
-    "@deterministic-code/datasources-sqlserver": "^0.1.14",
+    "@deterministic-code/datasources": "^0.1.15",
+    "@deterministic-code/datasources-mysql": "^0.1.15",
+    "@deterministic-code/datasources-oracle": "^0.1.15",
+    "@deterministic-code/datasources-postgres": "^0.1.15",
+    "@deterministic-code/datasources-sqlite": "^0.1.15",
+    "@deterministic-code/datasources-sqlserver": "^0.1.15",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/generators-common": "0.0.1",
     "pluralize": "^8.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-cli",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "type": "module",
   "bin": {
     "datasources": "./bin/datasources.mjs"
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deterministic-code/datasources-code-generators": "0.1.16",
+    "@deterministic-code/datasources-code-generators": "0.1.17",
     "@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.14",
-    "@deterministic-code/datasources-sqlite": "^0.1.14",
-    "@deterministic-code/datasources-mysql": "^0.1.14",
-    "@deterministic-code/datasources-postgres": "^0.1.14",
-    "@deterministic-code/datasources-sqlserver": "^0.1.14",
-    "@deterministic-code/datasources-oracle": "^0.1.14",
+    "@deterministic-code/datasources": "^0.1.15",
+    "@deterministic-code/datasources-sqlite": "^0.1.15",
+    "@deterministic-code/datasources-mysql": "^0.1.15",
+    "@deterministic-code/datasources-postgres": "^0.1.15",
+    "@deterministic-code/datasources-sqlserver": "^0.1.15",
+    "@deterministic-code/datasources-oracle": "^0.1.15",
     "@inquirer/prompts": "^7.8.0",
     "yaml": "^2.6.0",
     "mustache": "^4.2.0",