@lumjs/core 1.38.3 → 1.38.5

package/lib/obj/cp.js

@@ -1,1374 +1,8 @@
 /**
- * Object property copying utilities
- * @module @lumjs/core/obj/cp
- */
-"use strict";
-
-const {S,F,def,isObj,isComplex,isArray,isNil} = require('../types');
-
-/// @see docs/src/obj-cp.js for type-defs and callbacks
-
-/**
- * A full set of type handlers for `cp`.
- * 
- * @extends {Set}
- * @alias module:@lumjs/core/obj/cp.HandlerSet
- */
-class HandlerSet extends Set
-{
-  /**
-   * Add a type handler to this set.
-   * @param {module:@lumjs/core/obj/cp~Typ} type
-   * 
-   * May alternatively be another `HandlerSet` instance,
-   * in which case all the type handlers in it will be added.
-   * 
-   * @returns {module:@lumjs/core/obj/cp.HandlerSet} `this`
-   * @throws {TypeError} If `typedef` is not valid.
-   */
-  add(value)
-  {
-    if (value instanceof HandlerSet)
-    {
-      for (const th of value)
-      {
-        super.add(th);
-      }
-      return this;
-    }
-    else if ($TY.is(value))
-    {
-      return super.add(value);
-    }
-    else
-    {
-      console.debug({value, set: this});
-      throw new TypeError("Invalid TypeDef object");
-    }
-  }
-
-  /**
-   * Find the handler for a given subject.
-   * 
-   * If no explicit handler in this set supports the subject,
-   * the special `object` handler will be returned as a default.
-   * 
-   * This method caches the result for each `subject` so that
-   * future requests don't have to run any tests.
-   * 
-   * @param {object} subject
-   * @returns {module:@lumjs/core/obj/cp~Typ}
-   */
-  for(subject)
-  {
-    if (this.subCache === undefined)
-    {
-      def(this, 'subCache', {value: new Map()});
-    }
-
-    if (this.subCache.has(subject))
-    {
-      return this.subCache.get(subject);
-    }
-
-    for (const def of this)
-    {
-      if (def.test(subject))
-      { // Found one.
-        this.subCache.set(subject, def);
-        return def;
-      }
-    }
-
-    // No specific handler found, use the default.
-    this.subCache.set(subject, TY.object);
-    return TY.object;
-  }
-
-  /**
-   * Clears the subject cache used by `for()`
-   */
-  clearCache()
-  {
-    if (this.subCache instanceof Map)
-    {
-      this.subCache.clear();
-    }
-  }
-
-} // HandlerSet class
-
-/**
- * Metadata and API methods for `cp.TY`
- * @namespace
- * @alias module:@lumjs/core/obj/cp.TY.self
- */
-const $TY =
-{
-  /**
-   * Property names that will be skipped by `TY.for()` method
-   */
-  SKIP_FOR: ['for','object','self'],
-  /**
-   * Property names reserved for HandlerSet getter properties in `TY`
-   */
-  DEF_SETS: ['all','default'],
-  /**
-   * Mandatory methods (function properties) in a valid type handler.
-   */
-  NEED_FNS: ['test','new','clone','cpOver','cpSafe','getProps'],
-
-  /**
-   * Default type handler functions used by `make()` function
-   */
-  DEFAULTS:
-  {
-    clone(o,c) 
-    {
-      return Object.assign(this.new(c), o);
-    },
-    cpOver: (o,s) => Object.assign(o, ...s),
-    cpSafe(o,ss,c)
-    {
-      for (const s of ss)
-      {
-        const ps = this.getProps(s,c);
-        for (const p in ps)
-        {
-          if (o[p] === undefined)
-          {
-            const d = ps[p];
-            def(o, p, d);
-          }
-        }
-      }
-      return o;
-    },
-    getProps(o,c)
-    {
-      const ap = Object.getOwnPropertyDescriptors(o)
-      if (c?.opts?.all) return ap;
-
-      const ep = {};
-      for (const p in ap)
-      {
-        if (ap[p].enumerable)
-        {
-          ep[p] = ap[p];
-        }
-      }
-      return ep;
-    },
-    extend()
-    {
-      return Object.assign({}, this, ...arguments);
-    },
-  }, // $TY.DEFAULTS
-
-  /**
-   * An array of reserved property names in `TY`;
-   * consists of `SKIP_FOR` and `DEF_SETS` combined.
-   */
-  get reserved()
-  {
-    return $TY.DEF_SETS.concat($TY.SKIP_FOR);
-  },
-
-  /**
-   * An array of the absolute minimum _required_ methods that **MUST** 
-   * be included when calling `make()` or `add()`.
-   * 
-   * It's `NEED_FNS` excluding any functions provided in `DEFAULTS`.
-   */
-  get requirements()
-  {
-    const defs = Object.keys($TY.DEFAULTS);
-    return $TY.NEED_FNS.filter(v => !defs.includes(v));
-  },
-
-  /**
-   * Make a new type handler definition
-   * 
-   * @param {object} indef - Properties/functions for the handler
-   * 
-   * Must contain at least functions for `test` and `new`.
-   * Any other mandatory functions will fallback on default versions.
-   * 
-   * @return {module:@lumjs/core/obj/cp~Typ}
-   * @throws {TypeError} If any required properties/functions are missing.
-   */
-  make(indef)
-  {
-    const outdef = Object.assign({}, $TY.DEFAULTS, indef);
-    if (!$TY.is(outdef))
-    {
-      console.debug({indef, outdef, required: $TY.requirements});
-      throw new TypeError("Type handler is missing requirements");
-    }
-    return outdef;
-  },
-
-  /**
-   * Add a new _named_ type handler (or HandlerSet) to `cp.TY`
-   * 
-   * @param {string} name - Name for the new type or set
-   * 
-   * For types, the classname is generally a safe choice.
-   * Examples: `Set`, `Map`, `Element`, `NodeList`, etc.
-   * Or lowercase variants: `map`, `nodelist`, etc.
-   * 
-   * For extensions of existing types, try to describe the changes.
-   * Examples: `arrayPush`, `lockedObject`, etc.
-   * 
-   * For sets, something descriptive of what the set contains or does.
-   * Examples: `dom`, `addToLists`, etc.
-   * 
-   * The name may not be any value in the `reserved` list!
-   * 
-   * @param {object} obj - What we are adding
-   * 
-   * If this is a `HandlerSet` object, or implements the complete 
-   * [type handler interface]{@link module:@lumjs/core/obj/cp~Typ}, 
-   * it will be added directly.
-   * 
-   * Anything else will be passed to 
-   * {@link module:@lumjs/core/obj/cp.TY.self.make make()} 
-   * to build a type handler.
-   * 
-   * @returns {module:@lumjs/core/obj/cp.TY.self}
-   * So you can chain multiple .add() calls together.
-   * 
-   * @throws {RangeError} If `name` was a reserved value
-   * @throws {TypeError} See `make()` for details
-   * @see module:@lumjs/core/obj/cp.TY.self.make
-   */
-  add(name, obj)
-  {
-    if ($TY.reserved.includes(name))
-    {
-      throw new RangeError(name+' is a reserved property name');
-    }
-    if (!(obj instanceof HandlerSet) && !$TY.is(obj))
-    {
-      obj = $TY.make(obj);
-    }
-    TY[name] = obj;
-    return this;
-  },
-
-  /**
-   * Is a value a valid type handler definition for `cp`?
-   * @param {*} v - Value to test
-   * @returns {boolean}
-   * @see module:@lumjs/core/obj/cp~Typ
-   */
-  is(v)
-  {
-    if (!isObj(v)) return false;
-
-    for (const need of $TY.NEED_FNS)
-    {
-      if (typeof v[need] !== F)
-      {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-} // {$TY}
-
-/**
- * Type handler definitions for specific types of objects
- * that require special handling when cloning or composing.
- * 
- * @namespace
- * @alias module:@lumjs/core/obj/cp.TY
- */
-const TY =
-{
-  /**
-   * Handler for `object`
-   * 
-   * This is a special implicit handler and does NOT need to *ever*
-   * be explicitly added to a `HandlerSet`, as it's always used as
-   * the *default fallback* if no other type handler matches.
-   */
-  object: $TY.make(
-  {
-    _id: 'object',
-    test: () => true, 
-    new:  () => ({}),
-  }),
-
-  /**
-   * Handler for `Array`
-   * 
-   * It's `new()` method returns `[]`, and it's `clone()` method
-   * uses `subject.slice()` as a simple shallow array clone.
-   * 
-   * No other array-specific behaviour is implemented in this very
-   * basic type handler, however it would be easy enough to extend
-   * it to add custom functionality (such as appending all sources
-   * into the subject for example).
-   * 
-   * @type {module:@lumjs/core/obj/cp~Typ}
-   */
-  array: $TY.make(
-  {
-    _id: 'array',
-    test: isArray,
-    new:  () => ([]),
-    clone: v => v.slice(),
-  }),
-
-  /**
-   * Assemble a complete Type Handler set
-   * 
-   * @param  {...(string|object)} types - Type handlers to include
-   * 
-   * If this is a `string` it must be the name of a type handler
-   * property registered with the `TY` object itself.
-   * 
-   * If this is an `object`, it must implement the
-   * {@link module:@lumjs/core/obj/cp~Typ} interface.
-   * 
-   * @returns {module:@lumjs/core/obj/cp.HandlerSet}
-   * @throws {TypeError} If any of the `types` are not valid.
-   */
-  for(...types)
-  {
-    const defset = new HandlerSet();
-
-    for (const type of types)
-    { // First we'll add specified handlers.
-      if (typeof type === S 
-        && !$TY.SKIP_FOR.includes(type)
-        && (type in this))
-      { // The name of one of our registered types.
-        defset.add(this[type]);
-      }
-      else if (type !== TY.object)
-      { // If it isn't a valid TypeDef, a TypeError will be thrown.
-        defset.add(type);
-      }
-    }
-
-    return defset;
-  },
-
-  /**
-   * A getter for a base HandlerSet with only `array` and `object` support.
-   * 
-   * This getter creates a new instance every time it is accessed.
-   * 
-   * @type {module:@lumjs/core/obj/cp.HandlerSet}
-   */
-  get base()
-  {
-    return new HandlerSet([this.array]);
-  },
-
-  /**
-   * A getter for a handler set with *all* of our registered
-   * type handlers included in it. 
-   * 
-   * Unless another library like `@lumjs/web-core` has added 
-   * extra type handlers, this will end up being the same as 
-   * `default` at this point in time.
-   * 
-   * Like the `default` accessor property, this getter creates
-   * a new instance every time it is accessed.
-   * 
-   * @type {module:@lumjs/core/obj/cp.HandlerSet}
-   */
-  get all()
-  {
-    const types = Object.keys(this)
-      .filter((name) => !$TY.reserved.includes(name))
-      .map((name) => this[name]);
-    return new HandlerSet(types);
-  },
-
-} // {TY}
-
-/**
- * A globally shared default HandlerSet that will be used
- * if no other is specified manually.
- * 
- * Uses an instance of `cp.TY.base` as the default value.
- * May be overridden with any valid HandlerSet.
- * 
- * @type {module:@lumjs/core/obj/cp.HandlerSet}
- * @alias module:@lumjs/core/obj/cp.TY.default
- */
-TY.default = TY.base;
-
-function cpArgs(subject, ...sources)
-{
-  let handlers;
-  if (subject instanceof HandlerSet)
-  { 
-    handlers = subject;
-    subject = sources.shift();
-  }
-  else
-  {
-    handlers = TY.default;
-  }
-
-  const args = {subject, sources, handlers};
-
-  if (!isComplex(subject))
-  {
-    console.debug("Invalid subject", args);
-    args.invalid = true;
-    args.done = true;
-    return args;
-  }
-
-  args.th = handlers.for(subject);
-
-  if (sources.length === 0)
-  { // No sources? Just clone the subject.
-    args.subject = args.th.clone(subject);
-    args.done = true;
-  }
-
-  return args;
-} // cpArgs()
-
-/**
- * Copy enumerable properties into a subject.
- * 
- * This version overwrites any existing properties, with latter sources
- * taking precedence over earlier ones.
- * 
- * See {@link module:@lumjs/core/obj/cp.safe cp.safe()} for a version that
- * only copies non-existent properties.
- * 
- * **Note**: this is the actual `obj.cp` default export value! 
- * 
- * To keep JSDoc happy it is listed as a _named export_ inside 
- * the `cp` module, but in reality, it *is* the module.
- * 
- * So when you do: `const cp = require('@lumjs/core/obj/cp');`
- * or `const core = require('@lumjs/core), {cp} = core.obj;`
- * the `cp` variable will be this function. All the other named 
- * exports are properties attached to the function object itself.
- * 
- * The named export *does* exist as an alias to itself (`cp.cp = cp`).
- * 
- * @param {object} subject - Subject of the copy operation
- * 
- * If this is a {@link module:@lumjs/core/obj/cp.HandlerSet HandlerSet},
- * then it will be used instead of the default set, and the first
- * item in `sources` will be re-assigned to the `subject` argument.
- * 
- * If the `sources` have `0` items (after the HandlerSet logic obviously), 
- * then it indicates we want a shallow _clone_ of the subject. Which uses 
- * the {@link module:@lumjs/core/obj/cp~TypClone} method from the handler.
- * Examples: `cp(myObj)` or `cp(myHandlers, myObj)`
- *
- * If you need to include *all* properties (not just *enumerable* ones),
- * or need to do any kind of recursion or other advanced features, you'll
- * need to use the declarative API. e.g. `cp.from(subject).all.clone()`
- * 
- * @param  {...object} [sources] Sources to copy into the subject
- * 
- * This uses the {@link module:@lumjs/core/obj/cp~TypCpOver cpOver} method.
- * The default version of which uses `Object.assign()` to copy properties 
- * from each source into the subject. Which may have odd results if used
- * with certain kinds of objects.
- * 
- * Like with cloning, if you need any advanced features, you'll need to
- * use the declarative API. e.g. `cp.into(target).ow.deep.from(source)`
- * 
- * @returns {object} Either `subject` or a clone of `subject`.
- * 
- * @alias module:@lumjs/core/obj/cp.cp 
- */
-function cp()
-{
-  const args = cpArgs(...arguments);
-  if (args.done) return args.subject;
-  return args.th.cpOver(args.subject, args.sources);
-}
-
-/**
- * Copy non-existent enumerable properties into a subject.
- * 
- * This is a version of {@link module:@lumjs/core/obj/cp.cp cp()} that
- * uses the {@link module:@lumjs/core/obj/cp~TypCpSafe cpSafe} method
- * when copying properties so it does not overwrite existing properties.
- * 
- * Other than that difference, the rest of the arguments and their 
- * associated behaviours are identical to `cp()`, so see that for details.
- * 
- * @param {object} subject 
- * @param  {...object} sources 
- * @returns {object}
- * @alias module:@lumjs/core/obj/cp.safe
- */
-cp.safe = function()
-{
-  const args = cpArgs(...arguments);
-  if (args.done) return args.subject;
-  return args.th.cpSafe(args.subject, args.sources);
-}
-
-/**
- * Make a clone of an object using JSON
+ * Object property copying utilities.
  * 
- * Serialize an object to JSON, then parse it back into an object.
- * It's a ridiculously simple method for simple _deep_ cloning,
- * but comes with many limitations inherent to JSON serialization.
+ * NOTE: This now just re-exports the `@lumjs/cp` package.
  * 
- * @param {object} obj - Object to clone
- * @param {object} [opts] Advanced options 
- * @param {function} [opts.replace] A JSON _replacer_ function
- * @param {function} [opts.revive] A JSON _reviver_ function
- * @returns {object} A clone of the `obj`
- * @alias module:@lumjs/core/obj/cp.json
- */
-cp.json = function(obj, opts={})
-{
-  if (!isObj(obj))
-  {
-    console.warn("cp.json() does not support non-object");
-    return obj;
-  }
-
-  return JSON.parse(JSON.stringify(obj, opts.replace), opts.revive);
-}
-
-const DEFAULT_CPAPI_OPTS =
-{
-  all: false,
-  overwrite: false,
-  recursive: 0,
-  toggleDepth: -1,
-  proto: false,
-}
-
-const VALIDATION =
-{
-  handlers: v => v instanceof HandlerSet,
-  onUpdate: v => typeof v === F,
-}
-
-for (const opt in DEFAULT_CPAPI_OPTS)
-{ // Generate some default validation rules based on type values.
-  if (VALIDATION[opt] === undefined)
-  {
-    const vt = typeof DEFAULT_CPAPI_OPTS[opt];
-    VALIDATION[opt] = v => typeof(v) === vt;
-  }
-}
-
-const CPAPI_TOGGLE_OPTS = ['deep','ow'];
-
-/**
- * Context object for use in the declarative API.
- * 
- * May have additional properties added by `opts.onUpdate()` if used.
- * This documentation lists only standard properties that will be
- * used without any custom options.
- * 
- * Properties marked with **¿** will only be included when applicable.
- * 
- * Properties marked with **¡** may be set automatically when applicable.
- * Currently that only applies to type handlers, which will be looked
- * up using `opts.handlers.for()` as a convenience shortcut.
- * 
- * @prop {module:@lumjs/core/obj/cp.API} cp - API instance
- * @prop {object} opts - Current options; defaults to `cp.opts`
- * @prop {number} depth - Current recusion depth (`0` is top-level)
- * @prop {?object} prev - Previous context (if applicable)
- * 
- * Will be `null` unless if `opts.recusive` is not `0` and the
- * context is for a nested operation (top-level will always be `null`).
- * 
- * @prop {object} [target] Current target **¿**
- * @prop {object} [source] Current source **¿**
- * @prop {number} [ti] Current target index **¿**
- * @prop {number} [si] Current source index **¿**
- * @prop {module:@lumjs/core/obj/cp~Typ} [th] Handler for `target` **¡**
- * @prop {module:@lumjs/core/obj/cp~Typ} [sh] Handler for `source` **¡**
- * 
- * @prop {(string|symbol)} [prop] Property being operated on **¿**
- * @prop {object} [td] Target descriptor for `prop` **¿**
- * @prop {object} [sd] Source descriptor for `prop` **¿**
- * 
- * @alias module:@lumjs/core/obj/cp~Context
- */
-class CPContext
-{
-  /**
-   * Build a new Context object.
-   * 
-   * Generally this is only called by the `cp.getContext()` API method.
-   * 
-   * This will call `this.update(prev, data)` after setting
-   * `this.cp` and `this.opts` to their default values.
-   * 
-   * Lastly it sets `this.prev` overwriting any previous value.
-   * 
-   * @param {module:@lumjs/core/obj/cp.API} api - API instance
-   * @param {object} data - Initial data
-   * @param {?module:@lumjs/core/obj/cp~Context} prev - Previous context
-   */
-  constructor(api, data, prev)
-  {
-    this.cp = api;
-    this.opts = api.opts;
-    this.depth = 0;
-    this.update(prev, data);
-    this.prev = prev;
-  }
-
-  /**
-   * Update the context with new data
-   * 
-   * Will automatically populate certain properties depending on
-   * the data added.
-   * 
-   * @param {...object} data - Properties to add to the context
-   * 
-   * Nothing is 
-   * 
-   * @returns {object} `this`
-   */
-  update()
-  {
-    Object.assign(this, ...arguments);
-
-    if (typeof this.opts.onUpdate === F)
-    {
-      this.opts.onUpdate(this, ...arguments);
-    }
-
-    if (this.target && !this.th)
-    {
-      this.th = this.opts.handlers.for(this.target);
-    }
-
-    if (this.source && !this.sh)
-    {
-      this.sh = this.opts.handlers.for(this.source);
-    }
-
-    return this;
-  }
-
-  /**
-   * Set context options
-   *
-   * It makes a _new object_ composing the original `this.opts` and `changes`,
-   * and sets that to `this.opts`. It does not change the original opts object.
-   * 
-   * This is meant to be called from custom `onUpdate` handler functions,
-   * and isn't actually used by anything in the library itself.
-   * 
-   * @param {object} changes - Any option values you want to change.
-   * 
-   * @returns {object} `this`
-   */
-  setOpts(changes)
-  {
-    this.opts = Object.assign({}, this.opts, changes);
-    return this;
-  }
-
-} // CPContext class
-
-/**
- * A class providing a declarative API for advanced `obj.cp` API calls.
- * 
- * This is based off of the earlier `copyProps` declarative API,
- * and is meant to replace it entirely in future releases of this library.
- * 
- * @alias module:@lumjs/core/obj/cp.API
- */
-class CPAPI
-{
-  /**
-   * Create a declarative `obj.cp` API instance.
-   * 
-   * You generally would never call this directly, but use one of the
-   * functions in `cp` instead, a few examples:
-   * 
-   * ```js
-   * // Copy properties recursively, allowing overwrite
-   * cp.into(target).ow.deep.from(source);
-   * 
-   * // Clone an object, including all (not just enumerable) properties
-   * let cloned = cp.from(obj).all.clone();
-   * 
-   * ```
-   * 
-   * @param {(object|function)} [opts] Options
-   * 
-   * If this is a `function` it will be used as the `opts.onUpdate` value.
-   * 
-   * If this is a {@link module:@lumjs/core/obj/cp.HandlerSet} object,
-   * it will be used as the `opts.handlers` value.
-   * 
-   * @param {module:@lumjs/core/obj/cp.HandlerSet} [opts.handlers]
-   * Specific type handlers to use with this API instance.
-   * 
-   * If not specified, the default set will be used.
-   * 
-   * @param {boolean} [opts.all=false] Include all properties?
-   * 
-   * If `false` (default), we'll only use *enumerable* properties.
-   * If `true` we'll include *all* property descriptors in the subject.
-   * 
-   * @param {boolean} [opts.overwrite=false] Overwrite existing properties?
-   * 
-   * @param {boolean} [opts.proto=false] Copy prototype?
-   * 
-   * If `true`, the prototype on each target will be set to the
-   * prototype of the first source. This is `false` by default.
-   * 
-   * @param {number} [opts.recursive=0] Recurse into nested objects?
-   * 
-   * - `0`   → disables recursion entirely (default)
-   * - `> 0` → specify depth recursion should be allowed
-   * - `< 0` → unlimited recursion depth
-   * 
-   * When recursion is enabled, we will cache nested objects that we've
-   * already processed, so we don't get stuck in an infinite loop.
-   * 
-   * @param {number} [opts.toggleDepth=-1] This is the recursion depth 
-   * that will be used when the `deep` toggle value is `true`.
-   * 
-   * @param {function} [opts.onUpdate] A custom function
-   */
-  constructor(opts={})
-  {
-    if (typeof opts === F)
-    {
-      opts = {onUpdate: opts, handlers: TY.default};
-    }
-    else if (opts instanceof HandlerSet)
-    {
-      opts = {handlers: opts};
-    }
-    else if (!(opts.handlers instanceof HandlerSet))
-    {
-      opts.handlers = TY.default;
-    }
-
-    this.opts = Object.assign({}, DEFAULT_CPAPI_OPTS);
-    this.set(opts);
-
-    this.sources = [];
-    this.targets = [];
-
-    this.nextToggle = true;
-  }
-
-  /**
-   * Get a context object to pass to type handler methods
-   * @param {object} data - Initial data for the context object
-   * @param {object} [prev] A previous context object (if applicable)
-   * @returns {module:@lumjs/core/obj/cp~Context}
-   */
-  getContext(data, prev=null)
-  {
-    return new CPContext(this, data, prev);
-  }
-
-  /**
-   * Use specific type handlers or a custom context onUpdate function.
-   * 
-   * @param {(module:@lumjs/core/obj/cp.HandlerSet|function)} arg
-   * 
-   * If this is a `function`, we will set `opts.onUpdate` using it. 
-   * Otherwise we will set `opts.handlers`.
-   * 
-   * @returns {object} `this`
-   * @throws {TypeError} If `arg` is invalid
-   */
-  use(arg)
-  {
-    const opt = typeof arg === F ? 'onUpdate' : 'handlers';
-    return this.set({[opt]: arg}, true);
-  }
-
-  /**
-   * The next *toggle accessor property* will be set to `false`.
-   * 
-   * This only affects the very next toggle, after which the
-   * toggle value will return to its default value of `true`.
-   * 
-   * You need to explicitly use `not` before each toggle property
-   * that you want to turn off instead of on.
-   */
-  get not() 
-  {
-    this.nextToggle = false;
-    return this;
-  }
-
-  /**
-   * Private method that handles all *toggle properties*.
-   * @private
-   * @param {string} opt - Name of option to toggle
-   * @param {*} [trueVal=true] Value to use if toggle is `true`
-   * @param {*} [falseVal=false] Value to use if toggle is `false`
-   * @returns {object} `this`
-   */
-  $toggle(opt, trueVal=true, falseVal=false)
-  {
-    this.opts[opt] = this.nextToggle ? trueVal : falseVal;
-    this.nextToggle = true;
-    return this;
-  }
-
-  /**
-   * Toggle `opts.all` with boolean value when accessed
-   */
-  get all()
-  {
-    return this.$toggle('all');
-  }
-
-  /**
-   * Toggle `opts.overwrite` with boolean value when accessed
-   */
-  get ow()
-  {
-    return this.$toggle('overwrite');
-  }
-
-  /**
-   * Toggle `opts.recursive` when accessed
-   * 
-   * Value to set depends on the toggle value:
-   * 
-   * `true`  → `opts.recursive = opts.toggleDepth`
-   * `false` → `opts.recursive = 0`
-   * 
-   */
-  get deep()
-  {
-    const max = this.opts.toggleDepth;
-    if (max === 0) console.error("toggleDepth is 0", {cp: this});
-    return this.$toggle('recursive', max, 0);
-  }
-
-  /**
-   * Set specified options
-   * @param {object} opts - Options to set
-   * @param {boolean} [fatal=false] Throw on invalid type?
-   * 
-   * By default we report invalid option values to the console,
-   * and simply skip setting the invalid option. 
-   * 
-   * If this is `true` any invalid option values will result in
-   * an error being thrown, ending the entire `set()` process.
-   * 
-   * @returns {object} `this`
-   * @throws {TypeError} See `fatal` argument for details
-   */
-  set(opts, fatal=false)
-  {
-    if (isObj(opts))
-    {
-      for (const opt in opts)
-      {
-        if (opt in VALIDATION)
-        {
-          if (!VALIDATION[opt](opts[opt]))
-          {
-            const msg = 'invalid option value';
-            const info = {opt, opts, cp: this};
-            if (fatal)
-            {
-              console.error(info);
-              throw new TypeError(msg);
-            }
-            else
-            {
-              console.error(msg, info);
-              continue;
-            }
-          }
-        }
-        else if (opt in CPAPI_TOGGLE_OPTS)
-        { 
-          if (!opts[opt])
-          { // Negate the toggle.
-            this.not;
-          }
-          // Now toggle it.
-          this[opt];
-          continue;
-        }
-
-        this.opts[opt] = opts[opt];
-      }
-    }
-    else
-    {
-      console.error("invalid opts", {opts, cp: this});
-    }
-    return this;
-  }
-
-  /**
-   * Specify the `targets` to copy properties into.
-   * 
-   * @param {...object} [targets] The target objects
-   * 
-   * If you don't specify any targets, then `this.targets`
-   * will be cleared of any existing objects.
-   * 
-   * If `this.sources` has objects in it, then we'll copy
-   * those sources into each of the specified targets.
-   * 
-   * If `this.sources` is empty, then this will set
-   * `this.targets` to the specified value.
-   * 
-   * @returns {object} `this`
-   */
-  into(...targets)
-  {
-    if (this.sources.length > 0 && targets.length > 0)
-    {
-      this.$runAll(this.sources, targets);
-    }
-    else 
-    {
-      this.targets = targets;
-    }
-    return this;
-  }
-
-  /**
-   * Specify the `sources` to copy properties from.
-   * 
-   * @param  {...object} [sources] The source objects.
-   * 
-   * If you don't specify any sources, then `this.sources`
-   * will be cleared of any existing objects.
-   * 
-   * If `this.targets` has objects in it, then we'll copy 
-   * the specified sources into each of those targets.
-   * 
-   * If `this.targets` is empty, then this will set
-   * `this.sources` to the specified value.
-   * 
-   * @returns {object} `this`
-   */
-  from(...sources)
-  {
-    if (this.targets.length > 0 && sources.length > 0)
-    {
-      this.$runAll(sources, this.targets);
-    }
-    else 
-    {
-      this.sources = sources;
-    }
-    return this;
-  }
-
-  /**
-   * Add additional subjects
-   * 
-   * - If you started with `from()` this adds to the sources.
-   * - If you started with `into()` this adds to the targets.
-   * 
-   * @param  {...object} subjects - More sources or targets to add
-   * @returns {object} `this`
-   */
-  and(...subjects)
-  {
-    if (this.sources.length > 0)
-    {
-      this.sources.push(...subjects);
-    }
-    else if (this.targets.length > 0)
-    {
-      this.targets.push(...subjects);
-    }
-    else
-    {
-      console.error("No sources or targets set", {subjects, cp: this});
-    }
-    return this;
-  }
-
-  /**
-   * See if we can use EZ mode.
-   * 
-   * EZ-mode is a shortcut to use `cp()` or `cp.safe()`
-   * to perform copy operations if applicable.
-   */
-  get isEZ()
-  {
-    const o = this.opts;
-    return (!o.all && !o.recursive);
-  }
-  
-  /**
-   * Clone the properties of the sources into a new object.
-   * 
-   * This will only with if `cp.into()` was used to create the
-   * API instance. It will throw an error if `cp.from()` was used.
-   * 
-   * This gets the type handler for the first source, uses it
-   * to get a new object, then runs the copy operation with the
-   * new object as the sole target.
-   * 
-   * @returns {object} A new object
-   * @throws {RangeError} If there are targets set instead of sources
-   */
-  clone()
-  {
-    if (this.targets.length > 0)
-    {
-      console.debug(this);
-      throw new RangeError("cannot clone when targets set");
-    }
-
-    if (this.sources.length === 0)
-    {
-      console.debug(this);
-      throw new RangeError("cannot clone with no sources");
-    }
-
-    // Get the type handler for the first source.
-    const sh = this.opts.handlers.for(this.sources[0]);
-    const target = sh.new();
-
-    this.$runAll(this.sources, [target]);
-
-    return target;
-  }
-
-  /**
-   * Run a copy operation for the specified sources and targets.
-   * 
-   * For _each target_, it will find the type handler, then do one of:
-   * 
-   * - If `this.isEZ` is `true`, calls `cp()` or `cp.safe()` to perform 
-   *   the operation, and no further processing will be required.
-   * 
-   * - If the type handler has a `copyAll()` method,
-   *   that will be called, passing the `sources` array
-   *   in its entirety.
-   * 
-   * - If the type handler instead has a `copyOne()` method,
-   *   that will be called once for each source.
-   * 
-   * - If the handler has neither of those, then `this.$runOne()`
-   *   will be called once for each source.
-   * 
-   * @private
-   * @param {Array} sources 
-   * @param {Array} targets 
-   * @returns {void}
-   */
-  $runAll(sources, targets)
-  {
-    const ez = this.isEZ;
-    for (const ti in targets)
-    {
-      const target = targets[ti];
-
-      if (ez)
-      { // EZ mode, use one of the simple functions.
-        const hdl = this.opts.handlers;
-        const fun = this.opts.overwrite ? cp : cp.safe;
-        fun(hdl, target, ...sources);
-      }
-      else
-      { // Advanced mode supports many more options.
-        const ctx = this.getContext({target,ti,cache: []});
-        //console.debug({target, ti, ctx});
-        const {th} = ctx;
-        if (typeof th.copyAll === F)
-        { // Type handler will handle all sources at once.
-          th.copyAll(ctx, sources);
-        }
-        else
-        { // One source at a time.
-          const isHandled = (typeof th.copyOne === F);
-          for (const si in sources)
-          {
-            const source = sources[si];
-            ctx.update({source,si});
-
-            if (isHandled)
-            {
-              th.copyOne(ctx);
-            }
-            else
-            {
-              this.$runOne(ctx);
-            }
-          }
-        }
-      }
-    }
-  } // $runAll()
-
-  /**
-   * Run a copy operation from a single source into a single target.
-   * This is called by `$runAll()`, and also calls itself recursively
-   * if `opts.recursive` is not set to `0` (its default value).
-   * 
-   * @private
-   * @param {module:@lumjs/core/obj/cp~Context} ctx - Context;
-   * must have both `target` and `source` properties defined.
-   * @returns {void}
-   */
-  $runOne(rc)
-  {
-    const {target,source,cache} = rc;
-    const sprops = rc.sh.getProps(source, rc);
-    const tprops = rc.th.getProps(target, rc);
-
-    for (const prop in sprops)
-    {
-      const sd = sprops[prop];
-      let   td = tprops[prop];
-      
-      const pc = this.getContext({prop,sd}, rc);
-      const po = pc.opts;
-      
-      if ((po.recursive < 0 || (po.recursive > pc.depth))
-        && isObj(sd.value)
-        && !cache.includes(sd.value)
-      )
-      { // A nested object was found.
-        //console.debug("recursive mode", {sd,td});
-        cache.push(sd.value);
-        if (sd.value !== td?.value)
-        { // Not the same literal object.
-          pc.update({sh: null, source: sd.value});
-
-          if (isObj(td))
-          { // Use the existing target descriptor
-            pc.update({td});
-          }
-          else
-          { // Create a new descriptor.
-            const value = pc.sh.new();
-            //console.debug({ph: pctx.sh ,value});
-            td = Object.assign({}, sd, {value});
-            pc.update({td});
-            def(target, prop, pc.td);
-          }
-
-          //cache.push(td.value);
-          pc.update({th: null, target: td.value, depth: pc.depth+1});
-
-          this.$runOne(pc);
-        }
-      }
-      else if (po.overwrite || td === undefined)
-      {
-        def(target, prop, pc.sd);
-      }
-    }
-
-    if (rc.si === 0 && rc.opts.proto)
-    { // Prototype assignment only done with first source.
-      const sp = Object.getPrototypeOf(source);
-      const tp = Object.getPrototypeOf(target);
-      if (sp && sp !== tp)
-      { // Apply the source prototype to the target.
-        Object.setPrototypeOf(target, sp);
-      }
-    }
-
-  } // $runOne()
-
-} // CPAPI class
-
-/**
- * Create a new `cp` declarative API instance with the specified options.
- * @param {(function|object)} opts - Passed to the constructor
- * @returns {module:@lumjs/core/obj/cp.API} API instance
- * @alias module:@lumjs/core/obj/cp.with
- */
-cp.with = function(opts)
-{
-  return new CPAPI(opts);
-}
-
-/**
- * Create a new `cp` declarative API instance with default options,
- * and the specified target objects.
- * @param {...objects} targets - Target objects
- * @returns {module:@lumjs/core/obj/cp.API} API instance
- * @alias module:@lumjs/core/obj/cp.into
- */
-cp.into = function()
-{
-  return (new CPAPI()).into(...arguments);
-}
-
-/**
- * Create a new `cp` declarative API instance with default options,
- * and the specified source objects.
- * @param {...objects} source - Source objects
- * @returns {module:@lumjs/core/obj/cp.API} API instance
- * @alias module:@lumjs/core/obj/cp.from
- */
-cp.from = function()
-{
-  return (new CPAPI()).from(...arguments);
-}
-
-/**
- * A wrapper around `cp` specifically for cloning.
- * 
- * @param {object} obj - Object to clone
- * 
- * @param {?object} [opts] Options
- * 
- * If this is an `object`, the clone call will be:
- * `cp.with(opts).from(obj).ow.clone();`
- * 
- * If this is `null` or `undefined`, the call will be: 
- * `cp(obj);`
- * 
- * @returns {object} `obj`
- * @alias module:@lumjs/core/obj/cp.clone
- */
-cp.clone = function(obj, opts)
-{
-  if (isNil(opts))
-  { 
-    return cp(obj);
-  }
-  else
-  {
-    return cp.with(opts).from(obj).ow.clone();
-  }
-}
-
-/**
- * Add a clone() method to an object.
- * 
- * The method added is pretty simple with a very basic signature:
- * `obj.clone(opts)`, and it calls `cp.clone(obj,opts);`
- * 
- * @param {object} obj - Object to add method to
- * @param {object} [spec] Optional spec
- * @param {string} [spec.name='clone'] Method name to add;
- * Default: `clone`
- * @param {object} [spec.desc] Descriptor rules
- * @param {?object} [spec.opts] Default options for method;
- * Default is `null` so that simple cloning is the default.
- * 
- * @returns {object} `obj`
- * @alias module:@lumjs/core/obj/cp.addClone
- */
-function addClone(obj, spec={})
-{
-  const name = spec.name ?? 'clone';
-  const desc = spec.desc ?? {};
-  const defs = spec.opts ?? null;
-
-  desc.value = function(opts)
-  {
-    if (isObj(defs) && opts !== null)
-    {
-      opts = Object.assign({}, defs, opts);
-    }
-
-    return cp.clone(obj, opts);
-  }
-
-  return def(obj, name, desc);
-}
-
-/**
- * A singleton object offering cached `cp.API` instances.
- * @alias module:@lumjs/core/obj/cp.cache
+ * @module @lumjs/core/obj/cp
  */
-cp.cache =
-{
-  /**
-   * Return a `cp` instance with a single `target` object.
-   * 
-   * Will cache the instance the first time, so future calls
-   * with the same `target` will return the same instance.
-   * 
-   * @param {object} target 
-   * @returns {module:@lumjs/core/obj/cp.API}
-   */
-  into(target)
-  {
-    if (this.intoCache === undefined)
-      this.intoCache = new Map();
-    const cache = this.intoCache;
-    if (cache.has(target))
-    {
-      return cache.get(target);
-    }
-    else
-    {
-      const api = cp.into(target);
-      cache.set(target, api);
-      return api;
-    }
-  },
-  /**
-   * Return a `cp` instance with a single `source` object.
-   * 
-   * Will cache the instance the first time, so future calls
-   * with the same `target` will return the same instance.
-   * 
-   * @param {object} source 
-   * @returns {module:@lumjs/core/obj/cp.API}
-   */
-  from(source)
-  {
-    if (this.fromCache === undefined)
-      this.fromCache = new Map();
-    const cache = this.fromCache;
-    if (cache.has(source))
-    {
-      return cache.get(source);
-    }
-    else
-    {
-      const api = cp.from(source);
-      cache.set(source, api);
-      return api;
-    }
-  },
-  /**
-   * Clear the caches for `into` and `from`.
-   * @returns {object} `cp.cache`
-   */
-  clear()
-  {
-    if (this.intoCache)
-      this.intoCache.clear();
-    if (this.fromCache)
-      this.fromCache.clear();
-    return this;
-  },
-} // cp.cache
-
-// Assign the rest of the named exports
-Object.assign(cp,
-{
-  addClone, TY, HandlerSet,
-  API: CPAPI,
-  Context: CPContext,
-  __cpArgs: cpArgs,
-});
-
-// Export the module itself, including self reference.
-module.exports = cp.cp = cp;
+module.exports = require('@lumjs/cp/obj');