@rws-framework/db 3.3.7 → 3.4.1

package/.bin/add-v.sh

@@ -1,10 +1,92 @@
 #!/bin/bash
 
+# Check if version argument is provided
+if [ -z "$1" ]; then
+    echo "Error: Version argument is required"
+    echo "Usage: $0 <version>"
+    echo "Example: $0 1.2.4"
+    exit 1
+fi
+
 export VERSION=$1
 
-git add .
-git commit -m "v$VERSION"
-git tag $VERSION
-git push
-git push origin $VERSION
-npm publish
+# Validate version format (basic semver check)
+if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'; then
+    echo "Error: Version must be in semver format (e.g., 1.2.3)"
+    exit 1
+fi
+
+# Check if we're in a git repository
+if ! git rev-parse --git-dir >/dev/null 2>&1; then
+    echo "Error: Not in a git repository"
+    exit 1
+fi
+
+# Get list of changed files for commit message
+CHANGED_FILES=$(git diff --name-only HEAD 2>/dev/null || echo "")
+STAGED_FILES=$(git diff --cached --name-only 2>/dev/null || echo "")
+
+# Combine changed and staged files
+ALL_CHANGED_FILES="$CHANGED_FILES $STAGED_FILES"
+ALL_CHANGED_FILES=$(echo "$ALL_CHANGED_FILES" | tr ' ' '\n' | sort -u | tr '\n' ' ' | sed 's/[[:space:]]*$//')
+
+# Update package.json version
+echo "Updating package.json version to $VERSION..."
+npm version "$VERSION" --no-git-tag-version || {
+    echo "Error: Failed to update package.json version"
+    exit 1
+}
+
+# Add all changes
+echo "Adding changes to git..."
+git add . || {
+    echo "Error: Failed to add changes to git"
+    exit 1
+}
+
+# Create detailed commit message
+if [ -n "$ALL_CHANGED_FILES" ]; then
+    COMMIT_MSG="v$VERSION
+
+Changed files:
+$(echo "$ALL_CHANGED_FILES" | tr ' ' '\n' | sed 's/^/- /' | grep -v '^- $')"
+else
+    COMMIT_MSG="v$VERSION"
+fi
+
+# Commit with version and file list
+echo "Committing version $VERSION..."
+git commit -m "$COMMIT_MSG" || {
+    echo "Error: Failed to commit changes"
+    exit 1
+}
+
+# Create git tag
+echo "Creating git tag $VERSION..."
+git tag "$VERSION" || {
+    echo "Error: Failed to create git tag"
+    exit 1
+}
+
+# Push commits
+echo "Pushing commits..."
+git push || {
+    echo "Error: Failed to push commits"
+    exit 1
+}
+
+# Push tags
+echo "Pushing tags..."
+git push origin "$VERSION" || {
+    echo "Error: Failed to push tags"
+    exit 1
+}
+
+# Publish to npm
+echo "Publishing to npm..."
+npm publish || {
+    echo "Error: Failed to publish to npm"
+    exit 1
+}
+
+echo "Successfully published version $VERSION!"

package/.bin/emerge.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
-
-if ! command -v emerge >/dev/null 2>&1; then
-   echo "emerge command does not exist. Installing."
-    apt-get install graphviz graphviz-dev
-    pip install emerge-viz
-fi
-
-mkdir -p ./.emerge-vis-output/rws-server
-
+#!/bin/bash
+
+if ! command -v emerge >/dev/null 2>&1; then
+   echo "emerge command does not exist. Installing."
+    apt-get install graphviz graphviz-dev
+    pip install emerge-viz
+fi
+
+mkdir -p ./.emerge-vis-output/rws-server
+
 emerge -c ./.emerge-typescript-template.yaml

package/.eslintrc.json

@@ -1,53 +1,53 @@
-{
-    "env": {
-        "browser": false,
-        "es2021": true
-    },   
-    "plugins": ["@typescript-eslint", "unused-imports"],
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module",
-        "project": "./tsconfig.json"
-    },
-    "ignorePatterns": ["*.js"],
-    "rules": {
-        "no-unused-vars": "off",         
-        "no-case-declarations": "off",       
-        "no-prototype-builtins": "off",                
-        "unused-imports/no-unused-imports": "error",
-        "unused-imports/no-unused-vars": ["warn", { "vars": "all", "args": "none"}],     
-        "@typescript-eslint/no-var-requires": "off",   
-        "@typescript-eslint/semi": ["error", "always"],
-        "@typescript-eslint/no-unused-vars": "off",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-this-alias": "off",
-        "@typescript-eslint/type-annotation-spacing": ["error", {
-            "before": false,
-            "after": true,
-            "overrides": {
-              "arrow": {
-                "before": true, // Space before the arrow function's arrow
-                "after": true // Space after the arrow function's arrow
-              }
-            }
-        }],        
-        "indent": [
-            "error",
-            4
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": "off"
-    }
-}
+{
+    "env": {
+        "browser": false,
+        "es2021": true
+    },   
+    "plugins": ["@typescript-eslint", "unused-imports"],
+    "extends": [
+      "eslint:recommended",
+      "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module",
+        "project": "./tsconfig.json"
+    },
+    "ignorePatterns": ["*.js"],
+    "rules": {
+        "no-unused-vars": "off",         
+        "no-case-declarations": "off",       
+        "no-prototype-builtins": "off",                
+        "unused-imports/no-unused-imports": "error",
+        "unused-imports/no-unused-vars": ["warn", { "vars": "all", "args": "none"}],     
+        "@typescript-eslint/no-var-requires": "off",   
+        "@typescript-eslint/semi": ["error", "always"],
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-this-alias": "off",
+        "@typescript-eslint/type-annotation-spacing": ["error", {
+            "before": false,
+            "after": true,
+            "overrides": {
+              "arrow": {
+                "before": true, // Space before the arrow function's arrow
+                "after": true // Space after the arrow function's arrow
+              }
+            }
+        }],        
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": "off"
+    }
+}

package/dist/helper/DbHelper.d.ts

@@ -41,7 +41,7 @@ export declare class DbHelper {
      * @param dbUrl The database URL
      * @returns The base schema
      */
-    static generateBaseSchema(dbType: string, dbUrl: string): string;
+    static generateBaseSchema(dbType: string, dbUrl: string, output?: string, binaryTargets?: string[]): string;
     /**
      * Get the directory and path for the Prisma schema file
      */

package/dist/helper/DbHelper.js

@@ -52,8 +52,8 @@ class DbHelper {
      * @param dbUrl The database URL
      * @returns The base schema
      */
-    static generateBaseSchema(dbType, dbUrl) {
-        return db_1.SchemaGenerator.generateBaseSchema(dbType, dbUrl);
+    static generateBaseSchema(dbType, dbUrl, output, binaryTargets) {
+        return db_1.SchemaGenerator.generateBaseSchema(dbType, dbUrl, output, binaryTargets);
     }
     /**
      * Get the directory and path for the Prisma schema file

package/dist/helper/db/schema-generator.d.ts

@@ -12,7 +12,8 @@ export declare class SchemaGenerator {
      * @param dbUrl The database URL
      * @returns The base schema
      */
-    static generateBaseSchema(dbType: string, dbUrl: string): string;
+    static generateBaseSchema(dbType: string, dbUrl: string, output?: string, binaryTargets?: string[]): string;
+    private static ospath;
     /**
      * Generate model sections for the schema
      * @param model The model to generate a section for

package/dist/helper/db/schema-generator.js

@@ -24,17 +24,22 @@ class SchemaGenerator {
      * @param dbUrl The database URL
      * @returns The base schema
      */
-    static generateBaseSchema(dbType, dbUrl) {
+    static generateBaseSchema(dbType, dbUrl, output, binaryTargets) {
         process.env = { ...process.env, [this.dbUrlVarName]: dbUrl };
         return `generator client {
     provider = "prisma-client-js"
+    ${output ? `output = "${this.ospath(output)}"` : ''}
+    ${binaryTargets ? `binaryTargets = ${JSON.stringify(binaryTargets)}` : ''}
 }
 
 datasource db {
     provider = "${dbType}"
-    url = env("${this.dbUrlVarName}")
+    url = env("${this.dbUrlVarName}")    
 }`;
     }
+    static ospath(outPath) {
+        return outPath.split('')[1] === ':' ? outPath.replace(/\\/g, '\\\\') : outPath;
+    }
     /**
      * Generate model sections for the schema
      * @param model The model to generate a section for
@@ -93,10 +98,16 @@ datasource db {
                 const relationFieldName = modelMetadata.relationField ? modelMetadata.relationField : key.toLowerCase() + '_' + modelMetadata.relationField.toLowerCase();
                 const relatedToField = modelMetadata.relatedToField || 'id';
                 const bindingFieldExists = !!modelMetadatas[relationFieldName];
+                const relatedFieldMeta = relatedModelMetadatas[relatedToField];
+                const foundInverseRelation = Object.values(relatedModelMetadatas).find(item => item.metadata.foreignKey === relationFieldName && item.metadata.inversionModel._collection === modelName);
                 if (modelMetadata.required === false) {
                     requiredString = '?';
                 }
-                const cascadeStr = cascadeOpts.length ? `, ${cascadeOpts.join(', ')}` : '';
+                let cascadeStr = cascadeOpts.length ? `, ${cascadeOpts.join(', ')}` : '';
+                if (foundInverseRelation && foundInverseRelation.metadata.singular) {
+                    cascadeStr = '';
+                    requiredString = '?';
+                }
                 if (isMany) {
                     // Add an inverse field to the related model if it doesn't exist
                     section += `\t${key} ${relatedModel._collection}[] @relation(${relationName ? `"${relationName}", ` : ''}fields: [${relationFieldName}], references: [${relatedToField}]${mapName ? `, map: "${mapName}"` : ''}${cascadeStr})\n`;
@@ -104,7 +115,6 @@ datasource db {
                 else {
                     section += `\t${key} ${relatedModel._collection}${requiredString} @relation(${relationName ? `"${relationName}", ` : ''}fields: [${relationFieldName}], references: [${relatedToField}]${mapName ? `, map: "${mapName}"` : ''}${cascadeStr})\n`;
                     if (!bindingFieldExists) {
-                        const relatedFieldMeta = relatedModelMetadatas[relatedToField];
                         if (!relatedFieldMeta.metadata.required) {
                             requiredString = '';
                         }
@@ -113,24 +123,29 @@ datasource db {
                         if (relationMeta.required === false) {
                             requiredString = '?';
                         }
+                        let appendix = '';
+                        if (foundInverseRelation && foundInverseRelation.metadata.singular) {
+                            appendix = ' @unique';
+                            requiredString = '?';
+                        }
                         // Add relation field with appropriate type based on database
                         if (dbType === 'mongodb') {
-                            section += `\t${relationFieldName} String${requiredString} @db.ObjectId\n`;
+                            section += `\t${relationFieldName} String${requiredString} @db.ObjectId${appendix}\n`;
                         }
                         else if (dbType === 'mysql') {
                             // For MySQL, determine the type based on the related model's ID type
-                            section += `\t${relationFieldName} ${relatedFieldType}${requiredString}\n`;
+                            section += `\t${relationFieldName} ${relatedFieldType}${requiredString}${appendix}\n`;
                         }
                         else if (dbType === 'postgresql' || dbType === 'postgres') {
                             if (relatedFieldType === 'String') {
-                                section += `\t${relationFieldName} ${relatedFieldType}${requiredString} @db.Uuid\n`;
+                                section += `\t${relationFieldName} ${relatedFieldType}${requiredString} @db.Uuid${appendix}\n`;
                             }
                             else {
-                                section += `\t${relationFieldName} ${relatedFieldType}${requiredString}\n`;
+                                section += `\t${relationFieldName} ${relatedFieldType}${requiredString}${appendix}\n`;
                             }
                         }
                         else {
-                            section += `\t${relationFieldName} String${requiredString}\n`;
+                            section += `\t${relationFieldName} String${requiredString}${appendix}\n`;
                         }
                     }
                 }
@@ -145,11 +160,12 @@ datasource db {
                 const relationKey = [relatedModelName, modelName].join('_');
                 const relationIndex = relation_manager_1.RelationManager.getRelationCounter(relationKey, true);
                 const relationName = relation_manager_1.RelationManager.getShortenedRelationName(relatedModelName, modelName, relationIndex);
+                const singular = relationMeta.singular;
                 let relationTag = '';
                 if (relationMeta.relationName) {
                     relationTag = ` @relation("${relationMeta.relationName}")`;
                 }
-                section += `\t${key} ${relationMeta.inversionModel._collection}[]${relationTag}\n`;
+                section += `\t${key} ${relationMeta.inversionModel._collection}${singular ? '?' : '[]'}${relationTag}\n`;
                 relation_manager_1.RelationManager.completeRelation(relationKey, relationIndex, true);
             }
             else if (annotationType === 'InverseTimeSeries') {
@@ -266,7 +282,9 @@ datasource db {
     static async installPrisma(configService, dbService, leaveFile = false) {
         const dbUrl = configService.get('db_url');
         const dbType = configService.get('db_type') || 'mongodb';
-        let template = this.generateBaseSchema(dbType, dbUrl);
+        const dbPrismaOutput = configService.get('db_prisma_output');
+        const dbPrismaBinaryTargets = configService.get('db_prisma_binary_targets');
+        let template = this.generateBaseSchema(dbType, dbUrl, dbPrismaOutput, dbPrismaBinaryTargets);
         const dbModels = configService.get('db_models');
         if (dbModels) {
             for (const model of dbModels) {

package/dist/models/TimeSeriesModel.d.ts

@@ -1,7 +1,7 @@
-import { RWSModel } from './_model';
-export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>> {
-    value: number;
-    timestamp: Date;
-    params: any;
-    constructor(data?: any);
-}
+import { RWSModel } from './_model';
+export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>> {
+    value: number;
+    timestamp: Date;
+    params: any;
+    constructor(data?: any);
+}

package/dist/models/TimeSeriesModel.js

@@ -1,33 +1,33 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const _model_1 = require("./_model");
-class TimeSeriesModel extends _model_1.RWSModel {
-    constructor(data) {
-        super(data);
-        if (!this.timestamp) {
-            this.timestamp = new Date();
-        }
-    }
-}
-exports.default = TimeSeriesModel;
-__decorate([
-    (0, _model_1.TrackType)(Number),
-    __metadata("design:type", Number)
-], TimeSeriesModel.prototype, "value", void 0);
-__decorate([
-    (0, _model_1.TrackType)(Date),
-    __metadata("design:type", Date)
-], TimeSeriesModel.prototype, "timestamp", void 0);
-__decorate([
-    (0, _model_1.TrackType)(Object),
-    __metadata("design:type", Object)
-], TimeSeriesModel.prototype, "params", void 0);
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _model_1 = require("./_model");
+class TimeSeriesModel extends _model_1.RWSModel {
+    constructor(data) {
+        super(data);
+        if (!this.timestamp) {
+            this.timestamp = new Date();
+        }
+    }
+}
+exports.default = TimeSeriesModel;
+__decorate([
+    (0, _model_1.TrackType)(Number),
+    __metadata("design:type", Number)
+], TimeSeriesModel.prototype, "value", void 0);
+__decorate([
+    (0, _model_1.TrackType)(Date),
+    __metadata("design:type", Date)
+], TimeSeriesModel.prototype, "timestamp", void 0);
+__decorate([
+    (0, _model_1.TrackType)(Object),
+    __metadata("design:type", Object)
+], TimeSeriesModel.prototype, "params", void 0);

package/dist/models/interfaces/ITrackerOpts.d.ts

@@ -9,5 +9,7 @@ export interface ITrackerOpts extends IDbOpts {
     relatedTo?: OpModelType<any>;
     inversionModel?: OpModelType<any>;
     relationName?: string;
+    foreignKey?: string;
     noAuto?: boolean;
+    singular?: boolean;
 }

package/dist/models/types/RelationTypes.d.ts

@@ -19,6 +19,7 @@ export type RelManyMetaType<T extends IRWSModel> = {
         key: string;
         inversionModel: OpModelType<T>;
         foreignKey: string;
+        singular: boolean;
     };
 };
 export {};

package/dist/models/utils/HydrateUtils.js

@@ -48,12 +48,22 @@ class HydrateUtils {
             const relationEnabled = !RelationUtils_1.RelationUtils.checkRelDisabled(model, relMeta.key);
             if (relationEnabled) {
                 const pk = ModelUtils_1.ModelUtils.findPrimaryKeyFields(model.constructor);
-                model[relMeta.key] = await relMeta.inversionModel.findBy({
-                    conditions: {
-                        [relMeta.foreignKey]: data[pk]
-                    },
-                    allowRelations: false
-                });
+                if (relMeta.singular) {
+                    model[relMeta.key] = await relMeta.inversionModel.findOneBy({
+                        conditions: {
+                            [relMeta.foreignKey]: data[pk]
+                        },
+                        allowRelations: false
+                    });
+                }
+                else {
+                    model[relMeta.key] = await relMeta.inversionModel.findBy({
+                        conditions: {
+                            [relMeta.foreignKey]: data[pk]
+                        },
+                        allowRelations: false
+                    });
+                }
             }
         }
         // Handle one-to-one relations

package/dist/models/utils/RelationUtils.js

@@ -39,7 +39,8 @@ class RelationUtils {
                     relIds[key] = {
                         key: resolvedMetadata.key,
                         inversionModel: resolvedMetadata.inversionModel,
-                        foreignKey: resolvedMetadata.foreignKey
+                        foreignKey: resolvedMetadata.foreignKey,
+                        singular: resolvedMetadata?.singular || false
                     };
                 }
             }

package/dist/types/DbConfigHandler.d.ts

@@ -4,6 +4,8 @@ export interface IDbConfigParams {
     db_name?: string;
     db_type?: 'mongodb' | 'mysql' | 'sqlite' | 'postgresql' | 'postgres';
     db_models?: OpModelType<any>[];
+    db_prisma_output?: string;
+    db_prisma_binary_targets?: string[];
 }
 export interface IdGeneratorOptions {
     useUuid?: boolean;