@kaspernj/api-maker 1.0.2148 → 1.0.2149

package/build/cache-key-generator.d.ts

@@ -20,5 +20,7 @@ export default class CacheKeyGenerator {
     cacheKey(): any;
     /** feedModel. */
     feedModel(model: any, md5: any): void;
+    /** @returns {number | string} */
+    modelIdentity(model: any): number | string;
 }
 //# sourceMappingURL=cache-key-generator.d.ts.map

package/build/cache-key-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-key-generator.d.ts","sourceRoot":"/src/","sources":["cache-key-generator.js"],"names":[],"mappings":"AAEA,kDAAkD;AAClD;IACE,mBAAmB;IACnB,wBAOC;IANC,WAAkB;IAClB,iBAAwB;IACxB,eAAoB;IAGpB,sBAAyB;IAG3B,aAAa;IACb,aAMC;IAED,uBAAuB;IACvB,6CAIC;IAED,mBAAmB;IACnB,qDAGC;IAED,uBAAuB;IACvB,4DAIC;IAED,kBAAkB;IAClB,6BAsBC;IAED,gBAAgB;IAChB,gBAYC;IAED,iBAAiB;IACjB,sCAmBC;CACF"}
+{"version":3,"file":"cache-key-generator.d.ts","sourceRoot":"/src/","sources":["cache-key-generator.js"],"names":[],"mappings":"AAEA,kDAAkD;AAClD;IACE,mBAAmB;IACnB,wBAOC;IANC,WAAkB;IAClB,iBAAwB;IACxB,eAAoB;IAGpB,sBAAyB;IAG3B,aAAa;IACb,aAMC;IAED,uBAAuB;IACvB,6CAIC;IAED,mBAAmB;IACnB,qDAGC;IAED,uBAAuB;IACvB,4DAIC;IAED,kBAAkB;IAClB,6BAsBC;IAED,gBAAgB;IAChB,gBAYC;IAED,iBAAiB;IACjB,sCAmBC;IAED,iCAAiC;IACjC,2BADc,MAAM,GAAG,MAAM,CAa5B;CACF"}

package/build/cache-key-generator.js

@@ -25,11 +25,11 @@ export default class CacheKeyGenerator {
     /** recordModel. */
     recordModel(relationshipType, model) {
         this.allModels.push(model);
-        this.readModels[relationshipType][model.id() || model.uniqueKey()] = true;
+        this.readModels[relationshipType][this.modelIdentity(model)] = true;
     }
     /** isModelRecorded. */
     isModelRecorded(relationshipType, model) {
-        if (model.id() in this.readModels[relationshipType]) {
+        if (this.modelIdentity(model) in this.readModels[relationshipType]) {
             return true;
         }
     }
@@ -71,7 +71,7 @@ export default class CacheKeyGenerator {
         md5.append("--model--");
         md5.append(model.modelClassData().name);
         md5.append("--unique-key--");
-        md5.append(model.id() || model.uniqueKey());
+        md5.append(this.modelIdentity(model));
         if (model.markedForDestruction()) {
             md5.append("--marked-for-destruction--");
         }
@@ -83,5 +83,16 @@ export default class CacheKeyGenerator {
             md5.append(`${model.readAttributeUnderscore(attributeName)}`);
         }
     }
+    /** @returns {number | string} */
+    modelIdentity(model) {
+        const primaryKeyName = model.modelClass().primaryKey();
+        if (model.isAttributeLoaded(primaryKeyName)) {
+            const primaryKeyValue = model.primaryKey();
+            if (primaryKeyValue !== null && primaryKeyValue !== undefined && primaryKeyValue !== "") {
+                return primaryKeyValue;
+            }
+        }
+        return model.uniqueKey();
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUta2V5LWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIvc3JjLyIsInNvdXJjZXMiOlsiY2FjaGUta2V5LWdlbmVyYXRvci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFFBQVEsTUFBTSxXQUFXLENBQUE7QUFFaEMsa0RBQWtEO0FBQ2xELE1BQU0sQ0FBQyxPQUFPLE9BQU8saUJBQWlCO0lBQ3BDLG1CQUFtQjtJQUNuQixZQUFZLEtBQUs7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtRQUNsQixJQUFJLENBQUMsU0FBUyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDeEIsSUFBSSxDQUFDLFVBQVUsR0FBRyxFQUFFLENBQUE7UUFDcEIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsY0FBYyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDakQsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsY0FBYyxFQUFFLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFBO1FBQ3BELElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFBO0lBQzNCLENBQUM7SUFFRCxhQUFhO0lBQ2IsS0FBSztRQUNILE1BQU0sR0FBRyxHQUFHLElBQUksUUFBUSxFQUFFLENBQUE7UUFFMUIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBRS9CLE9BQU8sR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFBO0lBQ2xCLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsZUFBZSxDQUFDLGdCQUFnQjtRQUM5QixJQUFJLENBQUMsQ0FBQyxnQkFBZ0IsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUMzQyxJQUFJLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQ3hDLENBQUM7SUFDSCxDQUFDO0lBRUQsbUJBQW1CO0lBQ25CLFdBQVcs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Q0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1FBQzFDLENBQUM7UUFFRCxHQUFHLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBRTFCLE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxVQUFVLEVBQUUsQ0FBQTtRQUVyQyxLQUFLLE1BQU0sYUFBYSxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQ3ZDLEdBQUcsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUE7WUFDekIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQTtZQUMzQixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLHVCQUF1QixDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUMvRCxDQUFDO0lBQ0gsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFNwYXJrTUQ1IGZyb20gXCJzcGFyay1tZDVcIlxuXG4vKiogR2VuZXJhdGVzIGxvY2FsL2Z1bGwgY2FjaGUga2V5cyBmb3IgbW9kZWxzLiAqL1xuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ2FjaGVLZXlHZW5lcmF0b3Ige1xuICAvKiogQ29uc3RydWN0b3IuICovXG4gIGNvbnN0cnVjdG9yKG1vZGVsKSB7XG4gICAgdGhpcy5tb2RlbCA9IG1vZGVsXG4gICAgdGhpcy5hbGxNb2RlbHMgPSBbbW9kZWxdXG4gICAgdGhpcy5yZWFkTW9kZWxzID0ge31cbiAgICB0aGlzLnJlY29yZE1vZGVsVHlwZShtb2RlbC5tb2RlbENsYXNzRGF0YSgpLm5hbWUpXG4gICAgdGhpcy5yZWNvcmRNb2RlbChtb2RlbC5tb2RlbENsYXNzRGF0YSgpLm5hbWUsIG1vZGVsKVxuICAgIHRoaXMuZmlsbGVkTW9kZWxzID0gZmFsc2VcbiAgfVxuXG4gIC8qKiBsb2NhbC4gKi9cbiAgbG9jYWwoKSB7XG4gICAgY29uc3QgbWQ1ID0gbmV3IFNwYXJrTUQ1KClcblxuICAgIHRoaXMuZmVlZE1vZGVsKHRoaXMubW9kZWwsIG1kNSlcblxuICAgIHJldHVybiBtZDUuZW5kKClcbiAgfVxuXG4gIC8qKiByZWNvcmRNb2RlbFR5cGUuICovXG4gIHJlY29yZE1vZGVsVHlwZShyZWxhdGlvbnNoaXBUeXBlKSB7XG4gICAgaWYgKCEocmVsYXRpb25zaGlwVHlwZSBpbiB0aGlzLnJlYWRNb2RlbHMpKSB7XG4gICAgICB0aGlzLnJlYWRNb2RlbHNbcmVsYXRpb25zaGlwVHlwZV0gPSB7fVxuICAgIH1cbiAgfVxuXG4gIC8qKiByZWNvcmRNb2RlbC4gKi9cbiAgcmVjb3JkTW9kZWwocmVsYXRpb25zaGlwVHlwZSwgbW9kZWwpIHtcbiAgICB0aGlzLmFsbE1vZGVscy5wdXNoKG1vZGVsKVxuICAgIHRoaXMucmVhZE1vZGVsc1tyZWxhdGlvbnNoaXBUeXBlXVttb2RlbC5pZCgpIHx8IG1vZGVsLnVuaXF1ZUtleSgpXSA9IHRydWVcbiAgfVxuXG4gIC8qKiBpc01vZGVsUmVjb3JkZWQuICovXG4gIGlzTW9kZWxSZWNvcmRlZChyZWxhdGlvbnNoaXBUeXBlLCBtb2RlbCkge1xuICAgIGlmIChtb2RlbC5pZCgpIGluIHRoaXMucmVhZE1vZGVsc1tyZWxhdGlvbnNoaXBUeXBlXSkge1xuICAgICAgcmV0dXJuIHRydWVcbiAgICB9XG4gIH1cblxuICAvKiogZmlsbE1vZGVscy4gKi9cbiAgZmlsbE1vZGVscyhtb2RlbCkge1xuICAgIGZvciAoY29uc3QgcmVsYXRpb25zaGlwVHlwZSBpbiBtb2RlbC5yZWxhdGlvbnNoaXBzKSB7XG4gICAgICB0aGlzLnJlY29yZE1vZGVsVHlwZShyZWxhdGlvbnNoaXBUeXBlKVxuXG4gICAgICBjb25zdCBsb2FkZWRSZWxhdGlvbnNoaXAgPSBtb2RlbC5yZWxhdGlvbnNoaXBzW3JlbGF0aW9uc2hpcFR5cGVdXG5cbiAgICAgIGlmIChBcnJheS5pc0FycmF5KGxvYWRlZFJlbGF0aW9uc2hpcCkpIHsgLy8gaGFzX21hbnlcbiAgICAgICAgZm9yIChjb25zdCBhbm90aGVyTW9kZWwgb2YgbG9hZGVkUmVsYXRpb25zaGlwKSB7XG4gICAgICAgICAgaWYgKCF0aGlzLmlzTW9kZWxSZWNvcmRlZChyZWxhdGlvbnNoaXBUeXBlLCBhbm90aGVyTW9kZWwpKSB7XG4gICAgICAgICAgICB0aGlzLnJlY29yZE1vZGVsKHJlbGF0aW9uc2hpcFR5cGUsIGFub3RoZXJNb2RlbClcbiAgICAgICAgICAgIHRoaXMuZmlsbE1vZGVscyhhbm90aGVyTW9kZWwpXG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICB9IGVsc2UgaWYgKGxvYWRlZFJlbGF0aW9uc2hpcCkgeyAvLyBiZWxvbmdzX3RvLCBoYXNfb25lXG4gICAgICAgIGlmICghdGhpcy5pc01vZGVsUmVjb3JkZWQocmVsYXRpb25zaGlwVHlwZSwgbG9hZGVkUmVsYXRpb25zaGlwKSkge1xuICAgICAgICAgIHRoaXMucmVjb3JkTW9kZWwocmVsYXRpb25zaGlwVHlwZSwgbG9hZGVkUmVsYXRpb25zaGlwKVxuICAgICAgICAgIHRoaXMuZmlsbE1vZGVscyhsb2FkZWRSZWxhdGlvbnNoaXApXG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG5cbiAgICB0aGlzLmZpbGxlZE1vZGVscyA9IHRydWVcbiAgfVxuXG4gIC8qKiBjYWNoZUtleS4gKi9cbiAgY2FjaGVLZXkoKSB7XG4gICAgaWYgKCF0aGlzLmZpbGxlZE1vZGVscykge1xuICAgICAgdGhpcy5maWxsTW9kZWxzKHRoaXMubW9kZWwpXG4gICAgfVxuXG4gICAgY29uc3QgbWQ1ID0gbmV3IFNwYXJrTUQ1KClcblxuICAgIGZvciAoY29uc3QgbW9kZWwgb2YgdGhpcy5hbGxNb2RlbHMpIHtcbiAgICAgIHRoaXMuZmVlZE1vZGVsKG1vZGVsLCBtZDUpXG4gICAgfVxuXG4gICAgcmV0dXJuIG1kNS5lbmQoKVxuICB9XG5cbiAgLyoqIGZlZWRNb2RlbC4gKi9cbiAgZmVlZE1vZGVsKG1vZGVsLCBtZDUpIHtcbiAgICBtZDUuYXBwZW5kKFwiLS1tb2RlbC0tXCIpXG4gICAgbWQ1LmFwcGVuZChtb2RlbC5tb2RlbENsYXNzRGF0YSgpLm5hbWUpXG4gICAgbWQ1LmFwcGVuZChcIi0tdW5pcXVlLWtleS0tXCIpXG4gICAgbWQ1LmFwcGVuZChtb2RlbC5pZCgpIHx8IG1vZGVsLnVuaXF1ZUtleSgpKVxuXG4gICAgaWYgKG1vZGVsLm1hcmtlZEZvckRlc3RydWN0aW9uKCkpIHtcbiAgICAgIG1kNS5hcHBlbmQoXCItLW1hcmtlZC1mb3ItZGVzdHJ1Y3Rpb24tLVwiKVxuICAgIH1cblxuICAgIG1kNS5hcHBlbmQoXCItYXR0cmlidXRlcy1cIilcblxuICAgIGNvbnN0IGF0dHJpYnV0ZXMgPSBtb2RlbC5hdHRyaWJ1dGVzKClcblxuICAgIGZvciAoY29uc3QgYXR0cmlidXRlTmFtZSBpbiBhdHRyaWJ1dGVzKSB7XG4gICAgICBtZDUuYXBwZW5kKGF0dHJpYnV0ZU5hbWUpXG4gICAgICBtZDUuYXBwZW5kKFwiLS1hdHRyaWJ1dGUtLVwiKVxuICAgICAgbWQ1LmFwcGVuZChgJHttb2RlbC5yZWFkQXR0cmlidXRlVW5kZXJzY29yZShhdHRyaWJ1dGVOYW1lKX1gKVxuICAgIH1cbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cache-key-generator.js","sourceRoot":"/src/","sources":["cache-key-generator.js"],"names":[],"mappings":"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","sourcesContent":["import SparkMD5 from \"spark-md5\"\n\n/** Generates local/full cache keys for models. */\nexport default class CacheKeyGenerator {\n  /** Constructor. */\n  constructor(model) {\n    this.model = model\n    this.allModels = [model]\n    this.readModels = {}\n    this.recordModelType(model.modelClassData().name)\n    this.recordModel(model.modelClassData().name, model)\n    this.filledModels = false\n  }\n\n  /** local. */\n  local() {\n    const md5 = new SparkMD5()\n\n    this.feedModel(this.model, md5)\n\n    return md5.end()\n  }\n\n  /** recordModelType. */\n  recordModelType(relationshipType) {\n    if (!(relationshipType in this.readModels)) {\n      this.readModels[relationshipType] = {}\n    }\n  }\n\n  /** recordModel. */\n  recordModel(relationshipType, model) {\n    this.allModels.push(model)\n    this.readModels[relationshipType][this.modelIdentity(model)] = true\n  }\n\n  /** isModelRecorded. */\n  isModelRecorded(relationshipType, model) {\n    if (this.modelIdentity(model) in this.readModels[relationshipType]) {\n      return true\n    }\n  }\n\n  /** fillModels. */\n  fillModels(model) {\n    for (const relationshipType in model.relationships) {\n      this.recordModelType(relationshipType)\n\n      const loadedRelationship = model.relationships[relationshipType]\n\n      if (Array.isArray(loadedRelationship)) { // has_many\n        for (const anotherModel of loadedRelationship) {\n          if (!this.isModelRecorded(relationshipType, anotherModel)) {\n            this.recordModel(relationshipType, anotherModel)\n            this.fillModels(anotherModel)\n          }\n        }\n      } else if (loadedRelationship) { // belongs_to, has_one\n        if (!this.isModelRecorded(relationshipType, loadedRelationship)) {\n          this.recordModel(relationshipType, loadedRelationship)\n          this.fillModels(loadedRelationship)\n        }\n      }\n    }\n\n    this.filledModels = true\n  }\n\n  /** cacheKey. */\n  cacheKey() {\n    if (!this.filledModels) {\n      this.fillModels(this.model)\n    }\n\n    const md5 = new SparkMD5()\n\n    for (const model of this.allModels) {\n      this.feedModel(model, md5)\n    }\n\n    return md5.end()\n  }\n\n  /** feedModel. */\n  feedModel(model, md5) {\n    md5.append(\"--model--\")\n    md5.append(model.modelClassData().name)\n    md5.append(\"--unique-key--\")\n    md5.append(this.modelIdentity(model))\n\n    if (model.markedForDestruction()) {\n      md5.append(\"--marked-for-destruction--\")\n    }\n\n    md5.append(\"-attributes-\")\n\n    const attributes = model.attributes()\n\n    for (const attributeName in attributes) {\n      md5.append(attributeName)\n      md5.append(\"--attribute--\")\n      md5.append(`${model.readAttributeUnderscore(attributeName)}`)\n    }\n  }\n\n  /** @returns {number | string} */\n  modelIdentity(model) {\n    const primaryKeyName = model.modelClass().primaryKey()\n\n    if (model.isAttributeLoaded(primaryKeyName)) {\n      const primaryKeyValue = model.primaryKey()\n\n      if (primaryKeyValue !== null && primaryKeyValue !== undefined && primaryKeyValue !== \"\") {\n        return primaryKeyValue\n      }\n    }\n\n    return model.uniqueKey()\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaspernj/api-maker",
   "type": "module",
-  "version": "1.0.2148",
+  "version": "1.0.2149",
   "description": "My new module",
   "files": [
     "build/**"