@lumjs/core 1.9.0 → 1.10.0

package/TODO.md

@@ -1,6 +1,5 @@
 # TODO
 
-- core.context.isNode and .isBrowser break when using webpack!
 - Proper tests using new [@lumjs/tests](https://github.com/supernovus/lum.tests.js) library.
   - [x] `types/js`
   - [x] `types/basics` 

package/lib/context.js

@@ -21,37 +21,43 @@
  * @property {object} root - See {@link module:@lumjs/core/types.root}
  */
 
-const {root,B,F,U,O,isComplex,def} = require('./types');
+const {root,B,F,U,O,isComplex,isObj,def} = require('./types');
 
 const ctx = {root};
-
 const rootHas = what => typeof root[what] !== U;
 const cd = def(ctx, true);
+const CJS = {};
+const AMD = {};
+const cjs = def(CJS, true);
+const amd = def(AMD, true);
+const isLumV5 = typeof module.$lib === O && module.$lib.$cached === module;
 
-function isCommonJS(module)
-{
-  if (typeof module !== O || module === null) return false;
-  if (!ctx.hasRequire) return false;
-  if (!isComplex(module.exports)) return false;
-  if (typeof module.$lib === O && typeof module.$lib.$cached === O) 
-    return false; // It's our fake CommonJS emulation layer.
-  // Okay, all tests are okay.
-  return true;
-}
-
-cd('AMD', typeof define === F && define.amd)
+cd('hasDefine', typeof define === F)
   ('hasRequire', typeof require === F)
   ('hasExports', typeof exports !== U)
   ('hasModule', typeof module === O && module !== null)
-  ('CJS', isCommonJS(module)) // Detected value at load time in *this* module.
-  ('isCommonJS', isCommonJS)  // Dynamically detect via a module *reference*.
-  ('isNode', ctx.CJS && ctx.hasExports)
-  ('isWindow', !ctx.CJS && rootHas('window'))
-  ('isWorker', !ctx.CJS && rootHas('WorkerGlobalScope'))
-  ('isServiceWorker', !ctx.CJS && rootHas('ServiceWorkerGlobalScope'))
-  ('isDedicatedWorker', !ctx.CJS && rootHas('DedicatedWorkerGlobalScope'))
-  ('isSharedWorker', !ctx.CJS && rootHas('SharedWorkerGlobalScope'))
-  ('isBrowser', ctx.isWindow || ctx.isWorker)
+  ('hasModuleExports', isComplex(module.exports))
+  ;
+
+cjs('standard', ctx.hasModule && ctx.hasRequire)
+   ('nodeLike', CJS.standard && ctx.hasExports)
+   ('isLumV5', CJS.nodeLike && isLumV5)
+   ('isWebpack', CJS.nodeLike && require.resolve === require)
+   ('inBrowser', CJS.isLumV5 || CJS.isWebpack)
+   ;
+
+amd('isSupported', ctx.hasDefine && isObj(define.amd))
+   ('isRequireJS', AMD.isSupported && typeof requirejs === F)
+
+cd('CJS', CJS)
+  ('AMD', AMD)
+  ('isNode', CJS.nodeLike && !CJS.inBrowser)
+  ('isWindow', rootHas('window'))
+  ('isWorker', rootHas('WorkerGlobalScope'))
+  ('isServiceWorker', rootHas('ServiceWorkerGlobalScope'))
+  ('isDedicatedWorker', rootHas('DedicatedWorkerGlobalScope'))
+  ('isSharedWorker', rootHas('SharedWorkerGlobalScope'))
+  ('isBrowser', !ctx.isNode && (ctx.isWindow || ctx.isWorker))
   ;
 
 /**

package/lib/index.js

@@ -80,7 +80,8 @@ lazy(exports, 'obj', () => require('./obj'), E);
  * @name module:@lumjs/core.opt
  * @type {module:@lumjs/core/opt}
  */
-lazy(exports, 'opt', () => require('./opt'), E);
+const optOpts = {enumerable: true, def:{autoDesc: false}}
+lazy(exports, 'opt', () => require('./opt'), optOpts);
 
 // Get a bunch of properties from a submodule.
 function from(submod, ...libs)

package/package.json

@@ -1,21 +1,23 @@
 {
   "name": "@lumjs/core",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "main": "lib/index.js",
   "exports":
   {
     ".": "./lib/index.js",
-    "./types": "./lib/types/index.js",
+
     "./arrays": "./lib/arrays.js",
     "./context": "./lib/context.js",
-    "./strings": "./lib/strings.js",
+    "./enum": "./lib/enum.js",
     "./flags": "./lib/flags.js",
-    "./obj": "./lib/obj/index.js",
-    "./opt": "./lib/opt.js",
-    "./modules": "./lib/modules.js",
     "./meta": "./lib/meta.js",
-    "./enum": "./lib/enum.js",
+    "./modules": "./lib/modules.js",
+    "./obj": "./lib/obj/index.js",
     "./observable": "./lib/observable.js",
+    "./opt": "./lib/opt.js",
+    "./strings": "./lib/strings.js",
+    "./types": "./lib/types/index.js",
+
     "./package.json": "./package.json"
   },
   "license": "MIT",