@quatrain/core 1.1.51 → 1.2.1

package/src/components/BaseObject.ts

@@ -43,6 +43,12 @@ export class BaseObject extends AbstractObject {
    ): Promise<DataObjectType> {
       const dao = this.fillProperties(child)
 
+      if (src instanceof ObjectUri) {
+         dao.uri = src
+      } else if (typeof src === 'string') {
+         dao.uri.path = src
+      }
+
       return dao
    }
 
@@ -78,6 +84,10 @@ export class BaseObject extends AbstractObject {
             return this.fromObject(src)
          }
 
+         if (typeof src === 'string' && !src.includes('/')) {
+            src = `${this.COLLECTION}/${src}`
+         }
+
          const dao = await this.daoFactory(src, child)
 
          const constructedObject = Reflect.construct(this, [dao])

package/src/components/DataObject.ts

@@ -401,7 +401,7 @@ export class DataObject implements DataObjectType {
    }
 
    async clone(data: any = {}): Promise<DataObject> {
-      const cloned = await DataObject.factory()
+      const cloned = await (this.constructor as any).factory()
       cloned.uri.class = this.uri.class
       cloned._populated = false
 

package/src/components/test_script.ts

@@ -0,0 +1,17 @@
+import { BaseObject } from './BaseObject'
+import { StringProperty } from '../properties/StringProperty'
+
+class TestModel extends BaseObject {
+   static COLLECTION = 'test_collection'
+   static PROPS_DEFINITION = [
+      {
+         name: 'testProp',
+         type: StringProperty.TYPE,
+      },
+   ]
+}
+
+TestModel.factory('12345').then(obj => {
+   console.log('--- PATH ---', obj.uri.path)
+   console.log('--- URI ---', obj.uri)
+}).catch(console.error)

package/src/components/test_script3.ts

@@ -0,0 +1,5 @@
+import { ObjectUri } from './ObjectUri'
+const uri = new ObjectUri()
+uri.path = 'test_collection/12345'
+console.log('--- PATH ---', uri.path)
+console.log('--- URI ---', uri)

package/src/index.ts

@@ -24,6 +24,8 @@ import {
    CollectionPropertyType,
 } from './properties/CollectionProperty'
 import { ArrayProperty, ArrayPropertyType } from './properties/ArrayProperty'
+import { MapProperty, MapPropertyType } from './properties/MapProperty'
+import { FileProperty, FilePropertyType } from './properties/FileProperty'
 import { AbstractObject } from './components/AbstractObject'
 import { ObjectUri } from './components/ObjectUri'
 import { DataObjectClass } from './components/types/DataObjectClass'
@@ -44,9 +46,11 @@ import {
    NotFoundError,
    GoneError,
 } from './common/ResourcesErrors'
+import * as htmlType from './properties/types/PropertyHTMLType'
 import { DataObjectParams } from './components/types/DataObjectParams'
 
 export {
+   htmlType,
    statuses,
    Core,
    Property,
@@ -61,6 +65,8 @@ export {
    NumberProperty,
    returnAs,
    StringProperty,
+   MapProperty,
+   FileProperty,
    ObjectUri,
    DataObject,
    AbstractObject,
@@ -88,6 +94,8 @@ export type {
    ObjectPropertyType,
    NumberPropertyType,
    StringPropertyType,
+   MapPropertyType,
+   FilePropertyType,
    DataObjectClass,
    DataObjectProperties,
    BaseObjectType,

package/src/properties/CollectionProperty.test.ts

@@ -1,6 +1,6 @@
 import { Entity } from '../components/Entity'
 import { User } from '../components/User'
-import { DataGenerator } from '../common/DataGenerator'
+import { DataGenerator } from '@quatrain/testing'
 import * as statuses from '../common/statuses'
 
 describe('Collection Property', () => {

package/src/properties/StringProperty.ts

@@ -74,7 +74,7 @@ export class StringProperty extends BaseProperty {
          }
 
          if (this._minLength > 0 && value.length < this._minLength) {
-            throw new Error(`Value is too short`)
+            throw new Error(`${this._name}: value '${value}' is too short (min ${this._minLength})`)
          }
 
          if (this._maxLength > 0 && value.length > this._maxLength) {

package/src/properties/types/PropertyHTMLType.ts

@@ -10,6 +10,13 @@ export const PASSWORD = 'password'
 export const BIRTHDAY = 'bday'
 export const GENDER = 'sex'
 export const ORG = 'organization'
+export const TEXT = 'text'
+export const TEXTAREA = 'textarea'
+export const HIDDEN = 'hidden'
+export const SELECT = 'select'
+export const CHECKBOX = 'checkbox'
+export const NUMBER = 'number'
+export const FILE = 'file'
 
 export type PropertyHTMLType =
    | typeof OFF
@@ -21,3 +28,10 @@ export type PropertyHTMLType =
    | typeof BIRTHDAY
    | typeof GENDER
    | typeof ORG
+   | typeof TEXT
+   | typeof TEXTAREA
+   | typeof HIDDEN
+   | typeof SELECT
+   | typeof CHECKBOX
+   | typeof NUMBER
+   | typeof FILE

package/dist/common/DataGenerator.d.ts

@@ -1,3 +0,0 @@
-import { AbstractObject } from '../components/AbstractObject';
-export declare const DataGenerator: <T extends AbstractObject>(model: T, qty?: number, forcedValues?: any) => Promise<any>;
-//# sourceMappingURL=DataGenerator.d.ts.map

package/dist/common/DataGenerator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataGenerator.d.ts","sourceRoot":"","sources":["../../src/common/DataGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAY7D,eAAO,MAAM,aAAa,6CAElB,MAAM,iBACG,GAAG,KACjB,QAAQ,GAAG,CAgEb,CAAA"}

package/dist/common/DataGenerator.js

@@ -1,86 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataGenerator = void 0;
-const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
-const faker_1 = require("@faker-js/faker");
-const __1 = require("..");
-const DataGenerator = async (model, qty = 5, forcedValues = {}) => {
-    const promises = [];
-    __1.Core.info(`Starting to create ${qty} ${model.constructor.name} records`);
-    for (let i = 0; i < qty; i++) {
-        const dao = await model.dataObject.clone();
-        Object.keys(dao.properties).forEach((key) => {
-            __1.Core.debug(`Getting property for '${key}'`);
-            const property = dao.get(key);
-            if (forcedValues[key]) {
-                property.set(forcedValues[key]);
-                return;
-            }
-            switch (property.constructor.name) {
-                case 'StringProperty':
-                    switch (property.htmlType) {
-                        case htmlType.GIVEN_NAME:
-                            property.set(faker_1.faker.name.firstName());
-                            break;
-                        case htmlType.FAMILY_NAME:
-                            property.set(faker_1.faker.name.lastName());
-                            break;
-                        case htmlType.EMAIL:
-                            property.set(faker_1.faker.helpers.unique(faker_1.faker.internet.email));
-                            break;
-                        case htmlType.ORG:
-                            property.set(faker_1.faker.company.name());
-                            break;
-                        default:
-                            property.set(faker_1.faker.word.noun());
-                            break;
-                    }
-                    break;
-                case 'EnumProperty':
-                    property.set(faker_1.faker.helpers.arrayElement(property.values));
-                    break;
-                case 'HashProperty':
-                    property.set(faker_1.faker.random.alphaNumeric(16));
-                    break;
-                case 'DateTimeProperty':
-                    switch (property.htmlType) {
-                        case htmlType.BIRTHDAY:
-                            property.set(faker_1.faker.date.birthdate());
-                            break;
-                        default:
-                            break;
-                    }
-                    break;
-                default:
-                    break;
-            }
-        });
-        promises.push(dao);
-    }
-    return promises;
-};
-exports.DataGenerator = DataGenerator;
-//# sourceMappingURL=DataGenerator.js.map

package/dist/common/DataGenerator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataGenerator.js","sourceRoot":"","sources":["../../src/common/DataGenerator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+EAAgE;AAChE,2CAAuC;AACvC,0BAAyB;AASlB,MAAM,aAAa,GAAG,KAAK,EAC/B,KAAQ,EACR,MAAc,CAAC,EACf,eAAoB,EAAE,EACT,EAAE;IACf,MAAM,QAAQ,GAAQ,EAAE,CAAA;IACxB,QAAI,CAAC,IAAI,CAAC,sBAAsB,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC,CAAA;IACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QAE1C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACzC,QAAI,CAAC,KAAK,CAAC,yBAAyB,GAAG,GAAG,CAAC,CAAA;YAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAE7B,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;gBAC/B,OAAM;YACT,CAAC;YAED,QAAQ,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;gBACjC,KAAK,gBAAgB;oBAClB,QAAQ,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBACzB,KAAK,QAAQ,CAAC,UAAU;4BACrB,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;4BACpC,MAAK;wBACR,KAAK,QAAQ,CAAC,WAAW;4BACtB,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;4BACnC,MAAK;wBACR,KAAK,QAAQ,CAAC,KAAK;4BAChB,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,OAAO,CAAC,MAAM,CAAC,aAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;4BACxD,MAAK;wBACR,KAAK,QAAQ,CAAC,GAAG;4BACd,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;4BAClC,MAAK;wBACR;4BACG,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;4BAC/B,MAAK;oBACX,CAAC;oBACD,MAAK;gBAER,KAAK,cAAc;oBAChB,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;oBACzD,MAAK;gBAER,KAAK,cAAc;oBAChB,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAA;oBAC3C,MAAK;gBAER,KAAK,kBAAkB;oBACpB,QAAQ,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBACzB,KAAK,QAAQ,CAAC,QAAQ;4BACnB,QAAQ,CAAC,GAAG,CAAC,aAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;4BACpC,MAAK;wBACR;4BAEG,MAAK;oBACX,CAAC;oBACD,MAAK;gBAER;oBACG,MAAK;YACX,CAAC;QACJ,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACrB,CAAC;IAED,OAAO,QAAQ,CAAA;AAClB,CAAC,CAAA;AApEY,QAAA,aAAa,iBAoEzB"}

package/src/common/DataGenerator.ts

@@ -1,81 +0,0 @@
-import { AbstractObject } from '../components/AbstractObject'
-import * as htmlType from '../properties/types/PropertyHTMLType'
-import { faker } from '@faker-js/faker'
-import { Core } from '..'
-
-/**
- * Generate data from model of object and save it in default backend
- * @param model
- * @param qty
- * @param forcedValues
- * @returns
- */
-export const DataGenerator = async <T extends AbstractObject>(
-   model: T,
-   qty: number = 5,
-   forcedValues: any = {}
-): Promise<any> => {
-   const promises: any = []
-   Core.info(`Starting to create ${qty} ${model.constructor.name} records`)
-   for (let i = 0; i < qty; i++) {
-      const dao = await model.dataObject.clone()
-
-      Object.keys(dao.properties).forEach((key) => {
-         Core.debug(`Getting property for '${key}'`)
-         const property = dao.get(key)
-
-         if (forcedValues[key]) {
-            property.set(forcedValues[key])
-            return
-         }
-
-         switch (property.constructor.name) {
-            case 'StringProperty':
-               switch (property.htmlType) {
-                  case htmlType.GIVEN_NAME:
-                     property.set(faker.name.firstName())
-                     break
-                  case htmlType.FAMILY_NAME:
-                     property.set(faker.name.lastName())
-                     break
-                  case htmlType.EMAIL:
-                     property.set(faker.helpers.unique(faker.internet.email))
-                     break
-                  case htmlType.ORG:
-                     property.set(faker.company.name())
-                     break
-                  default:
-                     property.set(faker.word.noun())
-                     break
-               }
-               break
-
-            case 'EnumProperty':
-               property.set(faker.helpers.arrayElement(property.values))
-               break
-
-            case 'HashProperty':
-               property.set(faker.random.alphaNumeric(16))
-               break
-
-            case 'DateTimeProperty':
-               switch (property.htmlType) {
-                  case htmlType.BIRTHDAY:
-                     property.set(faker.date.birthdate())
-                     break
-                  default:
-                     //property.set(faker.date.future())
-                     break
-               }
-               break
-
-            default:
-               break
-         }
-      })
-
-      promises.push(dao)
-   }
-
-   return promises
-}