@needle-tools/engine 2.67.10-pre → 3.0.0-alpha.1

package/lib/engine/engine_patcher.js

@@ -4,55 +4,53 @@ const _wrappedMethods = new WeakSet();
  * Use patcher for patching properties insteadof calling Object.defineProperty individually
  * since this will cause conflicts if multiple patches need to be applied to the same property
  */
-export function addPatch(prototype, fieldName, cb) {
+export function addPatch(prototype, fieldName, beforeCallback, afterCallback) {
+    // TODO
+    return;
     // TODO: we probably want to turn this into a symbol to prevent anyone from overriding it
     // But when we need to store the symbol per prototype to allow e.g. material disposing to iterate those and dispose all
-    const backingField = fieldName + "__needle"; // Symbol(fieldName);// + " (patched)";
-    internalAddPatch(prototype, fieldName, cb);
+    const backingField = Symbol(fieldName + "__needle"); // Symbol(fieldName);// + " (patched)";
+    internalAddPatch(prototype, fieldName, afterCallback, beforeCallback);
     const desc = Object.getOwnPropertyDescriptor(prototype, fieldName);
+    const existing = prototype[fieldName];
+    console.log(prototype);
     if (desc) {
-        // TODO: check if the property is writable
-        // the property might be a method in which case we want to wrap it
-        if (typeof desc.value === "function") {
-            const method = desc.value;
-            if (method) {
-                if (_wrappedMethods.has(method)) {
-                    return;
-                }
-                _wrappedMethods.add(method);
-                prototype[fieldName] = function (...args) {
-                    // call the original method
-                    const result = method.apply(this, args);
-                    // call the patches
-                    const patches = getPatches(prototype, fieldName);
-                    if (patches) {
-                        for (const patch of patches) {
-                            patch(this, result, ...args);
-                        }
-                    }
-                    return result;
-                };
-            }
-            else {
-                // TODO: declare method?
-            }
-        }
-    }
-    else if (prototype.hasOwnProperty(backingField)) {
     }
     else {
         Object.defineProperty(prototype, fieldName, {
             set: function (value) {
-                const prev = this[backingField];
-                this[backingField] = value;
-                executePatches(prototype, fieldName, this, prev, value);
+                console.log("setting", fieldName, value);
+                if (typeof value === "function") {
+                    this[backingField] = addWrapper(value, prototype, fieldName);
+                }
+                else {
+                    const prev = this[backingField];
+                    executePrefixes(prototype, fieldName, this, prev, value);
+                    this[backingField] = value;
+                    executePostFixes(prototype, fieldName, this, prev, value);
+                }
             },
             get: function () {
-                return this[backingField];
+                console.log("GET", fieldName);
+                const value = this[backingField];
+                if (typeof value === "function") {
+                    if (value[backingField]) {
+                        return value[backingField];
+                    }
+                }
+                return value;
             }
         });
     }
 }
+function addWrapper(originalFunction, prototype, fieldname) {
+    return function (...args) {
+        executePrefixes(prototype, fieldname, this, ...args);
+        const result = originalFunction.apply(this, args);
+        executePostFixes(prototype, fieldname, this, result, ...args);
+        return result;
+    };
+}
 export function removePatch(prototype, fieldName, cb) {
     const patches = getPatches(prototype, fieldName);
     if (patches) {
@@ -63,35 +61,54 @@ export function removePatch(prototype, fieldName, cb) {
         }
     }
 }
-const patches = new WeakMap();
+export const NeedlePatchesKey = "Needle:Patches";
+function patches() {
+    if (!globalThis[NeedlePatchesKey]) {
+        globalThis[NeedlePatchesKey] = new WeakMap();
+    }
+    return globalThis[NeedlePatchesKey];
+}
 function getPatches(prototype, fieldName) {
-    let patchesMap = patches.get(prototype);
+    let patchesMap = patches().get(prototype);
     if (!patchesMap) {
         return null;
     }
     return patchesMap.get(fieldName);
     ;
 }
-function internalAddPatch(prototype, fieldName, cb) {
-    let patchesMap = patches.get(prototype);
+function internalAddPatch(prototype, fieldName, postfix, prefix) {
+    let patchesMap = patches().get(prototype);
     if (!patchesMap) {
         patchesMap = new Map();
-        patches.set(prototype, patchesMap);
+        patches().set(prototype, patchesMap);
     }
     let patchList = patchesMap.get(fieldName);
     if (!patchList) {
         patchList = [];
         patchesMap.set(fieldName, patchList);
     }
-    patchList.push(cb);
+    patchList.push({
+        prefix: prefix,
+        postfix: postfix
+    });
+}
+function executePrefixes(prototype, fieldName, instance, ...args) {
+    if (!instance)
+        return;
+    const patches = getPatches(prototype, fieldName);
+    if (patches) {
+        for (const patchInfo of patches) {
+            patchInfo.prefix?.call(instance, ...args);
+        }
+    }
 }
-function executePatches(prototype, fieldName, instance, oldValue, newValue) {
+function executePostFixes(prototype, fieldName, instance, result, ...args) {
     if (!instance)
         return;
     const patches = getPatches(prototype, fieldName);
     if (patches) {
-        for (const patch of patches) {
-            patch(instance, oldValue, newValue);
+        for (const patchInfo of patches) {
+            patchInfo.postfix?.call(instance, result, ...args);
         }
     }
 }

package/lib/engine/engine_patcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine_patcher.js","sourceRoot":"","sources":["../../src/engine/engine_patcher.ts"],"names":[],"mappings":"AACA,iGAAiG;AAEjG,MAAM,eAAe,GAAG,IAAI,OAAO,EAAE,CAAC;AAKtC;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAA0E,SAAgB,EAAE,SAAiB,EAAE,EAAa;IAEhJ,yFAAyF;IACzF,uHAAuH;IACvH,MAAM,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC,CAAA,uCAAuC;IAEnF,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnE,IAAI,IAAI,EAAE;QACN,0CAA0C;QAC1C,kEAAkE;QAClE,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1B,IAAI,MAAM,EAAE;gBACR,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAC7B,OAAO;iBACV;gBACD,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC5B,SAAS,CAAC,SAAS,CAAC,GAAG,UAAwB,GAAG,IAAW;oBACzD,2BAA2B;oBAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACxC,mBAAmB;oBACnB,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACjD,IAAI,OAAO,EAAE;wBACT,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;4BACzB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;yBAChC;qBACJ;oBACD,OAAO,MAAM,CAAC;gBAClB,CAAC,CAAA;aACJ;iBACI;gBACD,wBAAwB;aAC3B;SACJ;KACJ;SACI,IAAI,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;KAChD;SACI;QACD,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE;YACxC,GAAG,EAAE,UAAwB,KAAU;gBACnC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,IAAI,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;gBAC3B,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC5D,CAAC;YACD,GAAG,EAAE;gBACD,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC;YAC9B,CAAC;SACJ,CAAC,CAAC;KACN;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,SAAiB,EAAE,SAAiB,EAAE,EAAY;IAC1E,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,OAAO,EAAE;QACT,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;gBACnB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACxB;SACJ;KACJ;AACL,CAAC;AAKD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAmC,CAAC;AAE/D,SAAS,UAAU,CAAC,SAAS,EAAE,SAAiB;IAC5C,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,CAAC,UAAU,EAAE;QACb,OAAO,IAAI,CAAC;KACf;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAAA,CAAC;AACtC,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAS,EAAE,SAAiB,EAAE,EAAY;IAChE,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,CAAC,UAAU,EAAE;QACb,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;KACtC;IACD,IAAI,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,IAAI,CAAC,SAAS,EAAE;QACZ,SAAS,GAAG,EAAE,CAAC;QACf,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KACxC;IACD,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,cAAc,CAAC,SAAS,EAAE,SAAiB,EAAE,QAAgB,EAAE,QAAa,EAAE,QAAa;IAChG,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,OAAO,EAAE;QACT,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YACzB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACvC;KACJ;AACL,CAAC"}
+{"version":3,"file":"engine_patcher.js","sourceRoot":"","sources":["../../src/engine/engine_patcher.ts"],"names":[],"mappings":"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"}