Move @types to dist

app/assets/javascripts/@types/app/assets/javascripts/directives/views/conflictResolutionModal.d.ts

@@ -1,30 +0,0 @@
-/// <reference types="pug" />
-export class ConflictResolutionModal {
-    restrict: string;
-    template: import("pug").compileTemplate;
-    controller: typeof ConflictResolutionCtrl;
-    controllerAs: string;
-    bindToController: boolean;
-    scope: {
-        item1: string;
-        item2: string;
-        callback: string;
-        application: string;
-    };
-}
-declare class ConflictResolutionCtrl {
-    constructor($element: any);
-    $element: any;
-    $onInit(): void;
-    contentType: any;
-    item1Content: string | undefined;
-    item2Content: string | undefined;
-    createContentString(item: any): string;
-    keepItem1(): void;
-    keepItem2(): void;
-    keepBoth(): void;
-    export(): void;
-    triggerCallback(): void;
-    dismiss(): void;
-}
-export {};

app/assets/javascripts/tsconfig.json

@@ -8,19 +8,13 @@
     "isolatedModules": true,
     "esModuleInterop": true,
     "declaration": true,
-    "declarationDir": "@types",
     "emitDeclarationOnly": true,
+    "declarationDir": "../../../dist/@types",
     "baseUrl": ".",
-    "typeRoots": [
-      "node_modules/@types",
-      "node_modules/snjs/dist/@types/index.d.ts"
-    ],
     "paths": {
       "%/*": ["../templates/*"],
       "@/*": ["./*"],
       "@Controllers/*": ["./controllers/*"]
     }
-  },
-  "include": ["."],
-  "exclude": ["node_modules", "dist", "./@types"]
+  }
 }

dist/@types/app/assets/javascripts/application.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { PasswordWizardType } from './types';
 import { SNApplication, Challenge, ChallengeOrchestrator, ProtectedAction } from 'snjs';
 import { AppState, DesktopManager, LockManager, ArchiveManager, NativeExtManager, StatusManager, ThemeManager, PreferencesManager, KeyboardManager } from './services';

dist/@types/app/assets/javascripts/applicationManager.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { WebApplication } from './application';
 declare type AppManagerChangeCallback = () => void;
 export declare class ApplicationManager {

dist/@types/app/assets/javascripts/controllers/abstract/pure_ctrl.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { WebApplication } from './../../application';
 import { ApplicationEvent } from 'snjs';
 export declare type CtrlState = Partial<Record<string, any>>;

dist/@types/app/assets/javascripts/directives/functional/autofocus.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function autofocus($timeout: ng.ITimeoutService): {
     restrict: string;
     scope: {

dist/@types/app/assets/javascripts/directives/functional/click-outside.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function clickOutside($document: ng.IDocumentService): {
     restrict: string;
     replace: boolean;

dist/@types/app/assets/javascripts/directives/functional/elemReady.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function elemReady($parse: ng.IParseService): {
     restrict: string;
     link: ($scope: import("angular").IScope, elem: JQLite, attrs: any) => void;

dist/@types/app/assets/javascripts/directives/functional/file-change.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function fileChange(): {
     restrict: string;
     scope: {

dist/@types/app/assets/javascripts/directives/functional/infiniteScroll.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function infiniteScroll(): {
     link: (scope: import("angular").IScope, elem: JQLite, attrs: any) => void;
 };

dist/@types/app/assets/javascripts/directives/functional/lowercase.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function lowercase(): {
     require: string;
     link: (scope: import("angular").IScope, _: JQLite, attrs: any, ctrl: any) => void;

dist/@types/app/assets/javascripts/directives/functional/selectOnClick.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 export declare function selectOnClick($window: ng.IWindowService): {
     restrict: string;
     link: (scope: import("angular").IScope, element: JQLite) => void;

dist/@types/app/assets/javascripts/directives/functional/snEnter.d.ts

@@ -1 +1,2 @@
+/// <reference types="angular" />
 export declare function snEnter(): (scope: import("angular").IScope, element: JQLite, attrs: any) => void;

dist/@types/app/assets/javascripts/directives/views/componentModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { WebApplication } from './../../application';
 import { SNComponent } from 'snjs';
 import { WebDirective } from './../../types';

dist/@types/app/assets/javascripts/directives/views/inputModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { WebDirective } from './../../types';
 export interface InputModalScope extends Partial<ng.IScope> {
     type: string;

dist/@types/app/assets/javascripts/filters/trusted.d.ts

@@ -1 +1,2 @@
+/// <reference types="angular" />
 export declare function trusted($sce: ng.ISCEService): (url: string) => any;

dist/@types/app/assets/javascripts/routes.d.ts

@@ -1 +1,2 @@
+/// <reference types="angular" />
 export declare function configRoutes($locationProvider: ng.ILocationProvider): void;

dist/@types/app/assets/javascripts/services/desktopManager.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { SNComponent, PurePayload } from 'snjs';
 import { WebApplication } from '@/application';
 import { ApplicationService, ApplicationEvent } from 'snjs';

dist/@types/app/assets/javascripts/services/state.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { WebApplication } from './../application';
 import { SNTag, SNNote, SNUserPrefs } from 'snjs';
 export declare enum AppStateEvent {

dist/@types/app/assets/javascripts/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="angular" />
 import { SNComponent } from 'snjs';
 export declare class WebDirective implements ng.IDirective {
     controller?: string | ng.Injectable<ng.IControllerConstructor>;

dist/javascripts/app.js

@@ -1060,7 +1060,7 @@ var entry=new historyItemClass(payload);return entry;}/***/},/***/"./lib/service
     * Finds or creates a tag with a given title
     */},{key:"findOrCreateTagByTitle",value:function(){var _findOrCreateTagByTitle=_asyncToGenerator(/*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee21(title){var tag;return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee21$(_context21){while(1){switch(_context21.prev=_context21.next){case 0:tag=this.findTagByTitle(title);_context21.t0=tag;if(_context21.t0){_context21.next=6;break;}_context21.next=5;return this.createItem(_models_content_types__WEBPACK_IMPORTED_MODULE_18__["ContentType"].Tag,Object(_Models_functions__WEBPACK_IMPORTED_MODULE_11__["FillItemContent"])({title:title}),true);case 5:_context21.t0=_context21.sent;case 6:return _context21.abrupt("return",_context21.t0);case 7:case"end":return _context21.stop();}}},_callee21,this);}));function findOrCreateTagByTitle(_x42){return _findOrCreateTagByTitle.apply(this,arguments);}return findOrCreateTagByTitle;}()/**
      * Returns all notes matching the smart tag
-     */},{key:"notesMatchingSmartTag",value:function notesMatchingSmartTag(smartTag){var contentTypePredicate=new _models_core_predicate__WEBPACK_IMPORTED_MODULE_6__["SNPredicate"]('content_type','=',_models_content_types__WEBPACK_IMPORTED_MODULE_18__["ContentType"].Note);var predicates=[contentTypePredicate,smartTag.predicate];if(!smartTag.isTrashTag){var notTrashedPredicate=new _models_core_predicate__WEBPACK_IMPORTED_MODULE_6__["SNPredicate"]('content.trashed','=',false);predicates.push(notTrashedPredicate);}var results=this.itemsMatchingPredicates(predicates);return results;}/**
+     */},{key:"notesMatchingSmartTag",value:function notesMatchingSmartTag(smartTag){var contentTypePredicate=new _models_core_predicate__WEBPACK_IMPORTED_MODULE_6__["SNPredicate"]('content_type','=',_models_content_types__WEBPACK_IMPORTED_MODULE_18__["ContentType"].Note);var predicates=[contentTypePredicate,smartTag.predicate];if(!smartTag.isTrashTag){var notTrashedPredicate=new _models_core_predicate__WEBPACK_IMPORTED_MODULE_6__["SNPredicate"]('content.trashed','=',false);predicates.push(notTrashedPredicate);}return this.itemsMatchingPredicates(predicates);}/**
      * Returns the smart tag corresponding to the "Trash" tag.
      */},{key:"emptyTrash",/**
      * Permanently deletes any items currently in the trash. Consumer must manually call sync.