@angular-wave/angular.ts 0.0.13 → 0.0.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular-wave/angular.ts",
   "license": "MIT",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/exts/messages.md

@@ -518,33 +518,33 @@ _ {@link module:ngMessages Click here} to learn more about`ngMessages`and`ngMess
     _ @param {string} ngMessageExp|whenExp an expression value corresponding to the message key.
     _/
 
-                                                                                                /**
-                                                                                                * @ngdoc directive
-                                                                                                * @name ngMessageDefault
-                                                                                                * @restrict AE
-                                                                                                * @scope
-                                                                                                *
-                                                                                                * @description
-                                                                                                * `ngMessageDefault` is a directive with the purpose to show and hide a default message for
-                                                                                                * {@link directive:ngMessages}, when none of provided messages matches.
-                                                                                                *
-                                                                                                * More information about using `ngMessageDefault` can be found in the
-                                                                                                * {@link module:ngMessages `ngMessages` module documentation}.
-                                                                                                *
-                                                                                                * @usage
-                                                                                                * ```html
-                                                                                                * <!-- using attribute directives -->
-                                                                                                * <ANY ng-messages="expression" role="alert">
-                                                                                                *   <ANY ng-message="stringValue">...</ANY>
-                                                                                                *   <ANY ng-message="stringValue1, stringValue2, ...">...</ANY>
-                                                                                                *   <ANY ng-message-default>...</ANY>
-                                                                                                * </ANY>
-                                                                                                *
-                                                                                                * <!-- or by using element directives -->
-                                                                                                * <ng-messages for="expression" role="alert">
-                                                                                                *   <ng-message when="stringValue">...</ng-message>
-                                                                                                *   <ng-message when="stringValue1, stringValue2, ...">...</ng-message>
-                                                                                                *   <ng-message-default>...</ng-message-default>
-                                                                                                * </ng-messages>
-                                                                                                *
-                                                                                                */
+                                                                                                                            /**
+                                                                                                                            * @ngdoc directive
+                                                                                                                            * @name ngMessageDefault
+                                                                                                                            * @restrict AE
+                                                                                                                            * @scope
+                                                                                                                            *
+                                                                                                                            * @description
+                                                                                                                            * `ngMessageDefault` is a directive with the purpose to show and hide a default message for
+                                                                                                                            * {@link directive:ngMessages}, when none of provided messages matches.
+                                                                                                                            *
+                                                                                                                            * More information about using `ngMessageDefault` can be found in the
+                                                                                                                            * {@link module:ngMessages `ngMessages` module documentation}.
+                                                                                                                            *
+                                                                                                                            * @usage
+                                                                                                                            * ```html
+                                                                                                                            * <!-- using attribute directives -->
+                                                                                                                            * <ANY ng-messages="expression" role="alert">
+                                                                                                                            *   <ANY ng-message="stringValue">...</ANY>
+                                                                                                                            *   <ANY ng-message="stringValue1, stringValue2, ...">...</ANY>
+                                                                                                                            *   <ANY ng-message-default>...</ANY>
+                                                                                                                            * </ANY>
+                                                                                                                            *
+                                                                                                                            * <!-- or by using element directives -->
+                                                                                                                            * <ng-messages for="expression" role="alert">
+                                                                                                                            *   <ng-message when="stringValue">...</ng-message>
+                                                                                                                            *   <ng-message when="stringValue1, stringValue2, ...">...</ng-message>
+                                                                                                                            *   <ng-message-default>...</ng-message-default>
+                                                                                                                            * </ng-messages>
+                                                                                                                            *
+                                                                                                                            */

package/src/index.js

@@ -5,7 +5,6 @@ import { publishExternalAPI } from "./public";
  * @type {angular.IAngularStatic}
  */
 window.angular = new Angular();
-console.log(window.angular);
 
 publishExternalAPI();
 

package/src/router/adapter/directives/stateDirectives.js

@@ -4,23 +4,20 @@
  * These are the directives included in UI-Router for Angular 1.
  * These directives are used in templates to create viewports and link/navigate to states.
  *
- * @preferred @publicapi @module directives
- */ /** */
+ */
 import {
-  extend,
   forEach,
   tail,
-  isString,
-  isObject,
-  isArray,
-  parse,
   noop,
   unnestR,
   identity,
   uniqR,
   inArray,
   removeFrom,
-} from "../../core/index";
+} from "../../core/common/common";
+import { isString, isObject, isArray } from "../../core/common/predicates";
+
+import { parse } from "../../core/common/hof";
 /** @hidden */
 function parseStateRef(ref) {
   const paramsOnly = ref.match(/^\s*({[^}]*})\s*$/);
@@ -41,7 +38,7 @@ function stateContext(el) {
 /** @hidden */
 function processedDef($state, $element, def) {
   const uiState = def.uiState || $state.current.name;
-  const uiStateOpts = extend(
+  const uiStateOpts = Object.assign(
     defaultOpts($element, $state),
     def.uiStateOpts || {},
   );
@@ -52,12 +49,12 @@ function processedDef($state, $element, def) {
 function getTypeInfo(el) {
   // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
   const isSvg =
-    Object.prototype.toString.call(el.prop("href")) ===
+    Object.prototype.toString.call(el[0].getAttribute("href")) ===
     "[object SVGAnimatedString]";
   const isForm = el[0].nodeName === "FORM";
   return {
     attr: isForm ? "action" : isSvg ? "xlink:href" : "href",
-    isAnchor: el.prop("tagName").toUpperCase() === "A",
+    isAnchor: el[0].nodeName === "A",
     clickable: !isForm,
   };
 }
@@ -252,8 +249,7 @@ function bindEvents(element, scope, hookFn, uiStateOpts) {
  * - Unlike the parameter values expression, the state name is not `$watch`ed (for performance reasons).
  * If you need to dynamically update the state being linked to, use the fully dynamic [[uiState]] directive.
  */
-let uiSrefDirective;
-uiSrefDirective = [
+export let uiSrefDirective = [
   "$uiRouter",
   "$timeout",
   function $StateRefDirective($uiRouter, $timeout) {
@@ -286,12 +282,12 @@ uiSrefDirective = [
           scope.$watch(
             ref.paramExpr,
             function (val) {
-              rawDef.uiStateParams = extend({}, val);
+              rawDef.uiStateParams = Object.assign({}, val);
               update();
             },
             true,
           );
-          rawDef.uiStateParams = extend({}, scope.$eval(ref.paramExpr));
+          rawDef.uiStateParams = Object.assign({}, scope.$eval(ref.paramExpr));
         }
         update();
         scope.$on("$destroy", $uiRouter.stateRegistry.onStatesChanged(update));
@@ -390,8 +386,7 @@ uiSrefDirective = [
  * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example.
  * ```
  */
-let uiStateDirective;
-uiStateDirective = [
+export let uiStateDirective = [
   "$uiRouter",
   "$timeout",
   function $StateRefDynamicDirective($uiRouter, $timeout) {
@@ -540,8 +535,7 @@ uiStateDirective = [
  *
  * - Multiple classes may be specified in a space-separated format: `ui-sref-active='class1 class2 class3'`
  */
-let uiSrefActiveDirective;
-uiSrefActiveDirective = [
+export let uiSrefActiveDirective = [
   "$state",
   "$stateParams",
   "$interpolate",
@@ -675,9 +669,11 @@ uiSrefActiveDirective = [
               (cls) => !inArray(addClasses, cls),
             );
             $scope.$evalAsync(() => {
-              addClasses.forEach((className) => $element.addClass(className));
+              addClasses.forEach((className) =>
+                $element[0].classList.add(className),
+              );
               removeClasses.forEach((className) =>
-                $element.removeClass(className),
+                $element[0].classList.remove(className),
               );
             });
           }
@@ -687,9 +683,3 @@ uiSrefActiveDirective = [
     };
   },
 ];
-window.angular
-  .module("ui.router.state")
-  .directive("uiSref", uiSrefDirective)
-  .directive("uiSrefActive", uiSrefActiveDirective)
-  .directive("uiSrefActiveEq", uiSrefActiveDirective)
-  .directive("uiState", uiStateDirective);

package/src/router/adapter/directives/viewDirective.js

@@ -1,21 +1,13 @@
-/** @publicapi @module directives */ /** */
-import {
-  extend,
-  filter,
-  isDefined,
-  isFunction,
-  isString,
-  kebobString,
-  noop,
-  parse,
-  ResolveContext,
-  tail,
-  trace,
-  unnestR,
-} from "../../core/index";
-
+import { filter, tail, unnestR } from "../../core/common/common";
+import { isDefined, isFunction, isString } from "../../core/common/predicates";
+import { kebobString } from "../../core/common/strings";
+import { noop } from "../../core/common/common";
+import { parse } from "../../core/common/hof";
+import { ResolveContext } from "../../core/resolve/resolveContext";
+import { trace } from "../../core/common/trace";
 import { getLocals } from "../services";
 import { Ng1ViewConfig } from "../statebuilders/views";
+import { jqLite } from "../../../jqLite";
 /**
  * `ui-view`: A viewport directive which is filled in by a view from the active state.
  *
@@ -141,9 +133,7 @@ import { Ng1ViewConfig } from "../statebuilders/views";
  * });
  * ```
  */
-export let uiView;
-// eslint-disable-next-line prefer-const
-uiView = [
+export let uiView = [
   "$view",
   "$animate",
   "$uiViewScroll",
@@ -153,18 +143,18 @@ uiView = [
     function getRenderer() {
       return {
         enter: function (element, target, cb) {
-          if (angular.version.minor > 2) {
-            $animate.enter(element, null, target).then(cb);
-          } else {
-            $animate.enter(element, null, target, cb);
-          }
+          // if (angular.version.minor > 2) {
+          //$animate.enter(element, null, target).then(cb);
+          // } else {
+          $animate.enter(element, null, target, cb);
+          // }
         },
         leave: function (element, cb) {
-          if (angular.version.minor > 2) {
-            $animate.leave(element).then(cb);
-          } else {
-            $animate.leave(element, cb);
-          }
+          // if (angular.version.minor > 2) {
+          //$animate.leave(element).then(cb);
+          // } else {
+          $animate.leave(element, cb);
+          // }
         },
       };
     }
@@ -324,8 +314,13 @@ $ViewDirectiveFill.$inject = [
   "$view",
   "$q",
 ];
-/** @hidden */
-function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q) {
+export function $ViewDirectiveFill(
+  $compile,
+  $controller,
+  $transitions,
+  $view,
+  $q,
+) {
   const getControllerAs = parse("viewDecl.controllerAs");
   const getResolveAs = parse("viewDecl.resolveAs");
   return {
@@ -338,14 +333,18 @@ function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q) {
         const data = $element.data("$uiView");
         if (!data) {
           $element.html(initial);
-          $compile($element.contents())(scope);
+          $compile($element[0].contentDocument || $element[0].childNodes)(
+            scope,
+          );
           return;
         }
         const cfg = data.$cfg || { viewDecl: {}, getTemplate: noop };
         const resolveCtx = cfg.path && new ResolveContext(cfg.path);
         $element.html(cfg.getTemplate($element, resolveCtx) || initial);
         trace.traceUIViewFill(data.$uiView, $element.html());
-        const link = $compile($element.contents());
+        const link = $compile(
+          $element[0].contentDocument || $element[0].childNodes,
+        );
         const controller = cfg.controller;
         const controllerAs = getControllerAs(cfg);
         const resolveAs = getResolveAs(cfg);
@@ -354,7 +353,7 @@ function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q) {
         if (controller) {
           const controllerInstance = $controller(
             controller,
-            extend({}, locals, { $scope: scope, $element: $element }),
+            Object.assign({}, locals, { $scope: scope, $element: $element }),
           );
           if (controllerAs) {
             scope[controllerAs] = controllerInstance;
@@ -386,7 +385,7 @@ function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q) {
               .filter((el) => el && el.tagName && tagRegexp.exec(el.tagName));
             return (
               directiveEl &&
-              angular.element(directiveEl).data(`$${cfg.component}Controller`)
+              jqLite(directiveEl).data(`$${cfg.component}Controller`)
             );
           };
           const deregisterWatch = scope.$watch(
@@ -410,8 +409,6 @@ function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q) {
   };
 }
 /** @hidden */
-const hasComponentImpl =
-  typeof angular.module("ui.router")["component"] === "function";
 /** @hidden incrementing id */
 let _uiCanExitId = 0;
 /** @hidden TODO: move these callbacks to $view and/or `/hooks/components.ts` or something */
@@ -425,10 +422,7 @@ function registerControllerCallbacks(
   // Call $onInit() ASAP
   if (
     isFunction(controllerInstance.$onInit) &&
-    !(
-      (cfg.viewDecl.component || cfg.viewDecl.componentProvider) &&
-      hasComponentImpl
-    )
+    !(cfg.viewDecl.component || cfg.viewDecl.componentProvider)
   ) {
     controllerInstance.$onInit();
   }
@@ -508,7 +502,3 @@ function registerControllerCallbacks(
     );
   }
 }
-window.angular
-  .module("ui.router.state")
-  .directive("uiView", uiView)
-  .directive("uiView", $ViewDirectiveFill);

package/src/router/adapter/services.js

@@ -10,7 +10,7 @@
  */
 import { services } from "../core/common/coreservices";
 import { applyPairs, unnestR } from "../core/common/common";
-import { isString, extend } from "../../core/utils";
+import { isString } from "../../core/utils";
 import { trace } from "../core/common/trace";
 import { UIRouter } from "../core/router";
 import {
@@ -100,8 +100,9 @@ export function runBlock($injector, $q, $uiRouter) {
 // $state service and $stateProvider
 // $urlRouter service and $urlRouterProvider
 export function getStateProvider() {
-  debugger;
-  return extend(router.stateProvider, { $get: () => router.stateService });
+  return Object.assign(router.stateProvider, {
+    $get: () => router.stateService,
+  });
 }
 
 watchDigests.$inject = ["$rootScope"];

package/src/router/adapter/stateFilters.js

@@ -11,7 +11,7 @@
  * ```
  */
 $IsStateFilter.$inject = ["$state"];
-function $IsStateFilter($state) {
+export function $IsStateFilter($state) {
   const isFilter = function (state, params, options) {
     return $state.is(state, params, options);
   };
@@ -29,15 +29,10 @@ function $IsStateFilter($state) {
  * ```
  */
 $IncludedByStateFilter.$inject = ["$state"];
-function $IncludedByStateFilter($state) {
+export function $IncludedByStateFilter($state) {
   const includesFilter = function (state, params, options) {
     return $state.includes(state, params, options);
   };
   includesFilter.$stateful = true;
   return includesFilter;
 }
-window.angular
-  .module("ui.router.state")
-  .filter("isState", $IsStateFilter)
-  .filter("includedByState", $IncludedByStateFilter);
-export { $IsStateFilter, $IncludedByStateFilter };

package/src/router/adapter/statebuilders/onEnterExitRetain.js

@@ -1,7 +1,6 @@
 /** @publicapi @module ng1 */ /** */
 import { getLocals } from "../services";
 import { services } from "../../core/common/coreservices";
-import { extend } from "../../../core/utils";
 import { ResolveContext } from "../../core/resolve/resolveContext";
 
 /**
@@ -20,7 +19,7 @@ export const getStateHookBuilder = (hookName) =>
     function decoratedNg1Hook(trans, state) {
       const resolveContext = new ResolveContext(trans.treeChanges(pathname));
       const subContext = resolveContext.subContext(state.$$state());
-      const locals = extend(getLocals(subContext), {
+      const locals = Object.assign(getLocals(subContext), {
         $state$: state,
         $transition$: trans,
       });

package/src/router/adapter/statebuilders/views.js

@@ -1,5 +1,4 @@
-/** @publicapi @module ng1 */ /** */
-import { pick, forEach, tail, extend } from "../../core/common/common";
+import { pick, forEach, tail } from "../../core/common/common";
 import { isArray, isDefined, isString } from "../../../core/utils";
 import { isInjectable } from "../../core/common/predicates";
 import { services } from "../../core/common/coreservices";
@@ -69,7 +68,7 @@ export function ng1ViewsBuilder(state) {
     // Account for views: { header: "headerComponent" }
     if (isString(config)) config = { component: config };
     // Make a shallow copy of the config object
-    config = extend({}, config);
+    config = Object.assign({}, config);
     // Do not allow a view to mix props for component-style view with props for template/controller-style view
     if (hasAnyKey(compKeys, config) && hasAnyKey(nonCompKeys, config)) {
       throw new Error(
@@ -114,7 +113,7 @@ export class Ng1ViewConfig {
     const $q = services.$q;
     const context = new ResolveContext(this.path);
     const params = this.path.reduce(
-      (acc, node) => extend(acc, node.paramValues),
+      (acc, node) => Object.assign(acc, node.paramValues),
       {},
     );
     const promises = {
@@ -126,7 +125,7 @@ export class Ng1ViewConfig {
     return $q.all(promises).then((results) => {
       trace.traceViewServiceEvent("Loaded", this);
       this.controller = results.controller;
-      extend(this, results.template); // Either { template: "tpl" } or { component: "cmpName" }
+      Object.assign(this, results.template); // Either { template: "tpl" } or { component: "cmpName" }
       return this;
     });
   }

package/src/router/adapter/templateFactory.js

@@ -154,7 +154,7 @@ export class TemplateFactory {
   makeComponentTemplate(uiView, context, component, bindings) {
     bindings = bindings || {};
     // Bind once prefix
-    const prefix = angular.version.minor >= 3 ? "::" : "";
+    const prefix = "::"; //angular.version.minor >= 3 ? "::" : "";
     // Convert to kebob name. Add x- prefix if the string starts with `x-` or `data-`
     const kebob = (camelCase) => {
       const kebobed = kebobString(camelCase);

package/src/router/adapter/viewScroll.js

@@ -1,7 +1,4 @@
-/** @publicapi @module ng1 */ /** */
-
-/** @hidden */
-function $ViewScrollProvider() {
+export function $ViewScrollProvider() {
   let useAnchorScroll = false;
   this.useAnchorScroll = function () {
     useAnchorScroll = true;
@@ -25,7 +22,3 @@ function $ViewScrollProvider() {
     },
   ];
 }
-
-window.angular
-  .module("ui.router.state")
-  .provider("$uiViewScroll", $ViewScrollProvider);

package/src/router/core/common/common.js

@@ -13,12 +13,10 @@ export const root =
   (typeof self === "object" && self.self === self && self) ||
   (typeof global === "object" && global.global === global && global) ||
   this;
-const angular = root.angular || {};
-export const fromJson = angular.fromJson || JSON.parse.bind(JSON);
-export const toJson = angular.toJson || JSON.stringify.bind(JSON);
-export const forEach = angular.forEach || _forEach;
-export const extend = Object.assign || _extend;
-export const equals = angular.equals || _equals;
+export const fromJson = JSON.parse.bind(JSON);
+export const toJson = JSON.stringify.bind(JSON);
+export const forEach = _forEach;
+export const equals = _equals;
 export function identity(x) {
   return x;
 }
@@ -102,7 +100,7 @@ export function createProxyFunctions(
  * prototypal inheritance helper.
  * Creates a new object which has `parent` object as its prototype, and then copies the properties from `extra` onto it
  */
-export const inherit = (parent, extra) => extend(Object.create(parent), extra);
+export const inherit = (parent, extra) => Object.setPrototypeOf(parent, extra);
 /** Given an array, returns true if the object is found in the array, (using indexOf) */
 export const inArray = curry(_inArray);
 export function _inArray(array, obj) {
@@ -135,11 +133,11 @@ export const deregAll = (functions) =>
  * Earlier objects in the defaultsList take precedence when applying defaults.
  */
 export function defaults(opts, ...defaultsList) {
-  const defaultVals = extend({}, ...defaultsList.reverse());
-  return extend(defaultVals, pick(opts || {}, Object.keys(defaultVals)));
+  const defaultVals = Object.assign({}, ...defaultsList.reverse());
+  return Object.assign(defaultVals, pick(opts || {}, Object.keys(defaultVals)));
 }
 /** Reduce function that merges each element of the list into a single object, using extend */
-export const mergeR = (memo, item) => extend(memo, item);
+export const mergeR = (memo, item) => Object.assign(memo, item);
 /**
  * Finds the common ancestor path between two states.
  *
@@ -441,24 +439,14 @@ export function tail(arr) {
 export function copy(src, dest) {
   if (dest) Object.keys(dest).forEach((key) => delete dest[key]);
   if (!dest) dest = {};
-  return extend(dest, src);
+  return Object.assign(dest, src);
 }
 /** Naive forEach implementation works with Objects or Arrays */
 function _forEach(obj, cb, _this) {
   if (isArray(obj)) return obj.forEach(cb, _this);
   Object.keys(obj).forEach((key) => cb(obj[key], key));
 }
-export function _extend(toObj) {
-  for (let i = 1; i < arguments.length; i++) {
-    const obj = arguments[i];
-    if (!obj) continue;
-    const keys = Object.keys(obj);
-    for (let j = 0; j < keys.length; j++) {
-      toObj[keys[j]] = obj[keys[j]];
-    }
-  }
-  return toObj;
-}
+
 function _equals(o1, o2) {
   if (o1 === o2) return true;
   if (o1 === null || o2 === null) return false;

package/src/router/core/params/param.js

@@ -1,4 +1,4 @@
-import { extend, filter, map, allTrueR, find } from "../common/common";
+import { filter, map, allTrueR, find } from "../common/common";
 import { prop } from "../common/hof";
 import {
   isInjectable,
@@ -29,7 +29,7 @@ function getParamDeclaration(paramName, location, state) {
   const paramConfig = unwrapShorthand(
     state && state.params && state.params[paramName],
   );
-  return extend(defaultConfig, paramConfig);
+  return Object.assign(defaultConfig, paramConfig);
 }
 function unwrapShorthand(cfg) {
   cfg = isShorthand(cfg) ? { value: cfg } : cfg;
@@ -38,7 +38,7 @@ function unwrapShorthand(cfg) {
     return cfg.value;
   }
   const $$fn = isInjectable(cfg.value) ? cfg.value : getStaticDefaultValue;
-  return extend(cfg, { $$fn });
+  return Object.assign(cfg, { $$fn });
 }
 function getType(cfg, urlType, location, id, paramTypes) {
   if (cfg.type && urlType && urlType.name !== "string")
@@ -157,9 +157,9 @@ export class Param {
         array: location === DefType.SEARCH ? "auto" : false,
       };
       const arrayParamNomenclature = id.match(/\[\]$/) ? { array: true } : {};
-      return extend(arrayDefaults, arrayParamNomenclature, config).array;
+      return Object.assign(arrayDefaults, arrayParamNomenclature, config).array;
     }
-    extend(this, {
+    Object.assign(this, {
       id,
       type,
       location,

package/src/router/core/params/paramType.js

@@ -1,4 +1,4 @@
-import { extend, filter, map } from "../common/common";
+import { filter, map } from "../common/common";
 import { isArray, isDefined } from "../common/predicates";
 /**
  * An internal class which implements [[ParamTypeDefinition]].
@@ -34,7 +34,7 @@ export class ParamType {
     this.pattern = /.*/;
     /** @inheritdoc */
     this.inherit = true;
-    extend(this, def);
+    Object.assign(this, def);
   }
   // consider these four methods to be "abstract methods" that should be overridden
   /** @inheritdoc */
@@ -127,7 +127,7 @@ function ArrayType(type, mode) {
     const wrapperFn = name === "equals" ? arrayEqualsHandler : arrayHandler;
     this[name] = wrapperFn(paramTypeFn);
   });
-  extend(this, {
+  Object.assign(this, {
     dynamic: type.dynamic,
     name: type.name,
     pattern: type.pattern,