self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Tools: Renamed package namespace from @joplinapp to @joplin

Browse Source
This commit is contained in:
Laurent Cozic 2020-11-07 15:59:37 +00:00
parent f950e9b03f
commit 04bfbec96b
330 changed files with 1284 additions and 1284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.md
View File

@ -85,7 +85,7 @@ You can specify additional parameters when running the desktop or CLI applicatio
Since Joplin uses Lerna, adding a new dependency should not be done using `npm i -s ...`. Instead you should use the `lerna add` command, which will take care of adding the package while handling the linked packages correctly. For example, to add the package "leftpad" to the "app-desktop" sub-package, you would run:
npx lerna add leftpad --scope=@joplinapp/app-desktop
npx lerna add leftpad --scope=@joplin/app-desktop
Note that you should most likely always specify a scope because otherwise it will add the package to all the sub-packages.

4
packages/app-cli/README.md
View File

@ -1,11 +1,11 @@
# `@joplinapp/cli`
# `@joplin/cli`
> TODO: description
## Usage
```
const cli = require('@joplinapp/cli');
const cli = require('@joplin/cli');
// TODO: DEMONSTRATE API
```

4
packages/app-cli/app/ResourceServer.js
View File

@ -1,5 +1,5 @@
const Logger = require('@joplinapp/lib/Logger').default;
const { netUtils } = require('@joplinapp/lib/net-utils.js');
const Logger = require('@joplin/lib/Logger').default;
const { netUtils } = require('@joplin/lib/net-utils.js');
const http = require('http');
const urlParser = require('url');

30
packages/app-cli/app/app-gui.js
View File

@ -1,17 +1,17 @@
const Logger = require('@joplinapp/lib/Logger').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Note = require('@joplinapp/lib/models/Note.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const reducer = require('@joplinapp/lib/reducer').default;
const { defaultState } = require('@joplinapp/lib/reducer');
const { splitCommandString } = require('@joplinapp/lib/string-utils.js');
const { reg } = require('@joplinapp/lib/registry.js');
const { _ } = require('@joplinapp/lib/locale');
const shim = require('@joplinapp/lib/shim').default;
const Logger = require('@joplin/lib/Logger').default;
const Folder = require('@joplin/lib/models/Folder.js');
const BaseItem = require('@joplin/lib/models/BaseItem.js');
const Tag = require('@joplin/lib/models/Tag.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Note = require('@joplin/lib/models/Note.js');
const Resource = require('@joplin/lib/models/Resource.js');
const Setting = require('@joplin/lib/models/Setting').default;
const reducer = require('@joplin/lib/reducer').default;
const { defaultState } = require('@joplin/lib/reducer');
const { splitCommandString } = require('@joplin/lib/string-utils.js');
const { reg } = require('@joplin/lib/registry.js');
const { _ } = require('@joplin/lib/locale');
const shim = require('@joplin/lib/shim').default;
const Entities = require('html-entities').AllHtmlEntities;
const htmlentities = new Entities().encode;
@ -19,7 +19,7 @@ const chalk = require('chalk');
const tk = require('terminal-kit');
const TermWrapper = require('tkwidgets/framework/TermWrapper.js');
const Renderer = require('tkwidgets/framework/Renderer.js');
const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker');
const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker');
const BaseWidget = require('tkwidgets/BaseWidget.js');
const TextWidget = require('tkwidgets/TextWidget.js');

30
packages/app-cli/app/app.js
View File

@ -1,20 +1,20 @@
const BaseApplication = require('@joplinapp/lib/BaseApplication').default;
const { FoldersScreenUtils } = require('@joplinapp/lib/folders-screen-utils.js');
const ResourceService = require('@joplinapp/lib/services/ResourceService');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { reg } = require('@joplinapp/lib/registry.js');
const { fileExtension } = require('@joplinapp/lib/path-utils');
const { _ } = require('@joplinapp/lib/locale');
const BaseApplication = require('@joplin/lib/BaseApplication').default;
const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
const ResourceService = require('@joplin/lib/services/ResourceService');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const BaseItem = require('@joplin/lib/models/BaseItem.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const Setting = require('@joplin/lib/models/Setting').default;
const { reg } = require('@joplin/lib/registry.js');
const { fileExtension } = require('@joplin/lib/path-utils');
const { _ } = require('@joplin/lib/locale');
const fs = require('fs-extra');
const { cliUtils } = require('./cli-utils.js');
const Cache = require('@joplinapp/lib/Cache');
const RevisionService = require('@joplinapp/lib/services/RevisionService');
const shim = require('@joplinapp/lib/shim').default;
const Cache = require('@joplin/lib/Cache');
const RevisionService = require('@joplin/lib/services/RevisionService');
const shim = require('@joplin/lib/shim').default;
class Application extends BaseApplication {
constructor() {

6
packages/app-cli/app/autocompletion.js
View File

@ -1,7 +1,7 @@
const { app } = require('./app.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const Note = require('@joplin/lib/models/Note.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Tag = require('@joplin/lib/models/Tag.js');
const { cliUtils } = require('./cli-utils.js');
const yargParser = require('yargs-parser');
const fs = require('fs-extra');

4
packages/app-cli/app/base-command.js
View File

@ -1,5 +1,5 @@
const { _ } = require('@joplinapp/lib/locale');
const { reg } = require('@joplinapp/lib/registry.js');
const { _ } = require('@joplin/lib/locale');
const { reg } = require('@joplin/lib/registry.js');
class BaseCommand {
constructor() {

4
packages/app-cli/app/build-doc.js
View File

@ -1,7 +1,7 @@
const fs = require('fs-extra');
const { fileExtension, dirname } = require('@joplinapp/lib/path-utils');
const { fileExtension, dirname } = require('@joplin/lib/path-utils');
const wrap_ = require('word-wrap');
const { languageCode } = require('@joplinapp/lib/locale');
const { languageCode } = require('@joplin/lib/locale');
const rootDir = dirname(dirname(__dirname));
const MAX_WIDTH = 78;

16
packages/app-cli/app/cli-integration-tests.js
View File

@ -1,14 +1,14 @@
'use strict';
const fs = require('fs-extra');
const Logger = require('@joplinapp/lib/Logger').default;
const { dirname } = require('@joplinapp/lib/path-utils');
const { DatabaseDriverNode } = require('@joplinapp/lib/database-driver-node.js');
const { JoplinDatabase } = require('@joplinapp/lib/joplin-database.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Logger = require('@joplin/lib/Logger').default;
const { dirname } = require('@joplin/lib/path-utils');
const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
const { JoplinDatabase } = require('@joplin/lib/joplin-database.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Setting = require('@joplin/lib/models/Setting').default;
const { sprintf } = require('sprintf-js');
const exec = require('child_process').exec;

6
packages/app-cli/app/cli-utils.js
View File

@ -1,8 +1,8 @@
const yargParser = require('yargs-parser');
const { _ } = require('@joplinapp/lib/locale');
const time = require('@joplinapp/lib/time').default;
const { _ } = require('@joplin/lib/locale');
const time = require('@joplin/lib/time').default;
const stringPadding = require('string-padding');
const Logger = require('@joplinapp/lib/Logger').default;
const Logger = require('@joplin/lib/Logger').default;
const cliUtils = {};

14
packages/app-cli/app/command-apidoc.js
View File

@ -1,11 +1,11 @@
const { BaseCommand } = require('./base-command.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const { toTitleCase } = require('@joplinapp/lib/string-utils.js');
const { reg } = require('@joplinapp/lib/registry.js');
const markdownUtils = require('@joplinapp/lib/markdownUtils').default;
const { Database } = require('@joplinapp/lib/database.js');
const shim = require('@joplinapp/lib/shim').default;
const BaseItem = require('@joplin/lib/models/BaseItem');
const BaseModel = require('@joplin/lib/BaseModel').default;
const { toTitleCase } = require('@joplin/lib/string-utils.js');
const { reg } = require('@joplin/lib/registry.js');
const markdownUtils = require('@joplin/lib/markdownUtils').default;
const { Database } = require('@joplin/lib/database.js');
const shim = require('@joplin/lib/shim').default;
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-attach.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
class Command extends BaseCommand {
usage() {

8
packages/app-cli/app/command-cat.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const BaseItem = require('@joplinapp/lib/models/BaseItem.js');
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const BaseItem = require('@joplin/lib/models/BaseItem.js');
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

4
packages/app-cli/app/command-config.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { _, setLocale } = require('@joplinapp/lib/locale');
const { _, setLocale } = require('@joplin/lib/locale');
const { app } = require('./app.js');
const fs = require('fs-extra');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Setting = require('@joplin/lib/models/Setting').default;
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-cp.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

8
packages/app-cli/app/command-done.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Note = require('@joplinapp/lib/models/Note.js');
const time = require('@joplinapp/lib/time').default;
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Note = require('@joplin/lib/models/Note.js');
const time = require('@joplin/lib/time').default;
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-dump.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
class Command extends BaseCommand {
usage() {

14
packages/app-cli/app/command-e2ee.js
View File

@ -1,11 +1,11 @@
const { BaseCommand } = require('./base-command.js');
const { _ } = require('@joplinapp/lib/locale');
const EncryptionService = require('@joplinapp/lib/services/EncryptionService');
const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker');
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const Setting = require('@joplinapp/lib/models/Setting').default;
const shim = require('@joplinapp/lib/shim').default;
const pathUtils = require('@joplinapp/lib/path-utils');
const { _ } = require('@joplin/lib/locale');
const EncryptionService = require('@joplin/lib/services/EncryptionService');
const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker');
const BaseItem = require('@joplin/lib/models/BaseItem');
const Setting = require('@joplin/lib/models/Setting').default;
const shim = require('@joplin/lib/shim').default;
const pathUtils = require('@joplin/lib/path-utils');
const imageType = require('image-type');
const readChunk = require('read-chunk');

12
packages/app-cli/app/command-edit.js
View File

@ -1,12 +1,12 @@
const fs = require('fs-extra');
const { BaseCommand } = require('./base-command.js');
const { splitCommandString } = require('@joplinapp/lib/string-utils.js');
const uuid = require('@joplinapp/lib/uuid').default;
const { splitCommandString } = require('@joplin/lib/string-utils.js');
const uuid = require('@joplin/lib/uuid').default;
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Note = require('@joplinapp/lib/models/Note.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const { _ } = require('@joplin/lib/locale');
const Note = require('@joplin/lib/models/Note.js');
const Setting = require('@joplin/lib/models/Setting').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
class Command extends BaseCommand {
usage() {

2
packages/app-cli/app/command-exit.js
View File

@ -1,6 +1,6 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
class Command extends BaseCommand {
usage() {

4
packages/app-cli/app/command-export-sync-status.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { ReportService } = require('@joplinapp/lib/services/report.js');
const Setting = require('@joplin/lib/models/Setting').default;
const { ReportService } = require('@joplin/lib/services/report.js');
const fs = require('fs-extra');
class Command extends BaseCommand {

6
packages/app-cli/app/command-export.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const InteropService = require('@joplinapp/lib/services/interop/InteropService').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const InteropService = require('@joplin/lib/services/interop/InteropService').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-geoloc.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

2
packages/app-cli/app/command-help.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { renderCommandHelp } = require('./help-utils.js');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
const { cliUtils } = require('./cli-utils.js');
class Command extends BaseCommand {

6
packages/app-cli/app/command-import.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const InteropService = require('@joplinapp/lib/services/interop/InteropService').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const InteropService = require('@joplin/lib/services/interop/InteropService').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const { cliUtils } = require('./cli-utils.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
class Command extends BaseCommand {
usage() {

12
packages/app-cli/app/command-ls.js
View File

@ -1,12 +1,12 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Setting = require('@joplin/lib/models/Setting').default;
const Note = require('@joplin/lib/models/Note.js');
const { sprintf } = require('sprintf-js');
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { cliUtils } = require('./cli-utils.js');
class Command extends BaseCommand {

4
packages/app-cli/app/command-mkbook.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Folder = require('@joplinapp/lib/models/Folder.js');
const { _ } = require('@joplin/lib/locale');
const Folder = require('@joplin/lib/models/Folder.js');
class Command extends BaseCommand {
usage() {

4
packages/app-cli/app/command-mknote.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

4
packages/app-cli/app/command-mktodo.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

8
packages/app-cli/app/command-mv.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

8
packages/app-cli/app/command-ren.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-rmbook.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Folder = require('@joplinapp/lib/models/Folder.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const { _ } = require('@joplin/lib/locale');
const Folder = require('@joplin/lib/models/Folder.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-rmnote.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const { _ } = require('@joplin/lib/locale');
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
class Command extends BaseCommand {
usage() {

8
packages/app-cli/app/command-search.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const uuid = require('@joplinapp/lib/uuid').default;
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const uuid = require('@joplin/lib/uuid').default;
class Command extends BaseCommand {
usage() {

10
packages/app-cli/app/command-server.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { _ } = require('@joplinapp/lib/locale');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Logger = require('@joplinapp/lib/Logger').default;
const shim = require('@joplinapp/lib/shim').default;
const { _ } = require('@joplin/lib/locale');
const Setting = require('@joplin/lib/models/Setting').default;
const Logger = require('@joplin/lib/Logger').default;
const shim = require('@joplin/lib/shim').default;
class Command extends BaseCommand {
@ -17,7 +17,7 @@ class Command extends BaseCommand {
async action(args) {
const command = args.command;
const ClipperServer = require('@joplinapp/lib/ClipperServer');
const ClipperServer = require('@joplin/lib/ClipperServer');
ClipperServer.instance().initialize();
const stdoutFn = (...s) => this.stdout(s.join(' '));
const clipperLogger = new Logger();

8
packages/app-cli/app/command-set.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const { Database } = require('@joplinapp/lib/database.js');
const Note = require('@joplinapp/lib/models/Note.js');
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const { Database } = require('@joplin/lib/database.js');
const Note = require('@joplin/lib/models/Note.js');
class Command extends BaseCommand {
usage() {

6
packages/app-cli/app/command-status.js
View File

@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { _ } = require('@joplinapp/lib/locale');
const { ReportService } = require('@joplinapp/lib/services/report.js');
const Setting = require('@joplin/lib/models/Setting').default;
const { _ } = require('@joplin/lib/locale');
const { ReportService } = require('@joplin/lib/services/report.js');
class Command extends BaseCommand {
usage() {

16
packages/app-cli/app/command-sync.js
View File

@ -1,17 +1,17 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const { OneDriveApiNodeUtils } = require('@joplinapp/lib/onedrive-api-node-utils.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher');
const Synchronizer = require('@joplinapp/lib/Synchronizer').default;
const { reg } = require('@joplinapp/lib/registry.js');
const { _ } = require('@joplin/lib/locale');
const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js');
const Setting = require('@joplin/lib/models/Setting').default;
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher');
const Synchronizer = require('@joplin/lib/Synchronizer').default;
const { reg } = require('@joplin/lib/registry.js');
const { cliUtils } = require('./cli-utils.js');
const md5 = require('md5');
const locker = require('proper-lockfile');
const fs = require('fs-extra');
const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry');
const MigrationHandler = require('@joplinapp/lib/services/synchronizer/MigrationHandler').default;
const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry');
const MigrationHandler = require('@joplin/lib/services/synchronizer/MigrationHandler').default;
class Command extends BaseCommand {
constructor() {

8
packages/app-cli/app/command-tag.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const Tag = require('@joplinapp/lib/models/Tag.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const time = require('@joplinapp/lib/time').default;
const { _ } = require('@joplin/lib/locale');
const Tag = require('@joplin/lib/models/Tag.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const time = require('@joplin/lib/time').default;
class Command extends BaseCommand {
usage() {

8
packages/app-cli/app/command-todo.js
View File

@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Note = require('@joplinapp/lib/models/Note.js');
const time = require('@joplinapp/lib/time').default;
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Note = require('@joplin/lib/models/Note.js');
const time = require('@joplin/lib/time').default;
class Command extends BaseCommand {
usage() {

2
packages/app-cli/app/command-undone.js
View File

@ -1,5 +1,5 @@
const { BaseCommand } = require('./base-command.js');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
const CommandDone = require('./command-done.js');

4
packages/app-cli/app/command-use.js
View File

@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('@joplinapp/lib/locale');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const { _ } = require('@joplin/lib/locale');
const BaseModel = require('@joplin/lib/BaseModel').default;
class Command extends BaseCommand {
usage() {

4
packages/app-cli/app/command-version.js
View File

@ -1,6 +1,6 @@
const { BaseCommand } = require('./base-command.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { _ } = require('@joplinapp/lib/locale');
const Setting = require('@joplin/lib/models/Setting').default;
const { _ } = require('@joplin/lib/locale');
class Command extends BaseCommand {
usage() {

10
packages/app-cli/app/fuzzing.js
View File

@ -1,10 +1,10 @@
'use strict';
const time = require('@joplinapp/lib/time').default;
const Logger = require('@joplinapp/lib/Logger').default;
const Resource = require('@joplinapp/lib/models/Resource.js');
const { dirname } = require('@joplinapp/lib/path-utils');
const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default;
const time = require('@joplin/lib/time').default;
const Logger = require('@joplin/lib/Logger').default;
const Resource = require('@joplin/lib/models/Resource.js');
const { dirname } = require('@joplin/lib/path-utils');
const FsDriverNode = require('@joplin/lib/fs-driver-node').default;
const lodash = require('lodash');
const exec = require('child_process').exec;
const fs = require('fs-extra');

8
packages/app-cli/app/gui/FolderListWidget.js
View File

@ -1,8 +1,8 @@
const Folder = require('@joplinapp/lib/models/Folder.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Tag = require('@joplin/lib/models/Tag.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const ListWidget = require('tkwidgets/ListWidget.js');
const _ = require('@joplinapp/lib/locale')._;
const _ = require('@joplin/lib/locale')._;
class FolderListWidget extends ListWidget {
constructor() {

2
packages/app-cli/app/gui/NoteListWidget.js
View File

@ -1,4 +1,4 @@
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
const ListWidget = require('tkwidgets/ListWidget.js');
class NoteListWidget extends ListWidget {

2
packages/app-cli/app/gui/NoteMetadataWidget.js
View File

@ -1,4 +1,4 @@
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
const TextWidget = require('tkwidgets/TextWidget.js');
class NoteMetadataWidget extends TextWidget {

4
packages/app-cli/app/gui/NoteWidget.js
View File

@ -1,6 +1,6 @@
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
const TextWidget = require('tkwidgets/TextWidget.js');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
class NoteWidget extends TextWidget {
constructor() {

6
packages/app-cli/app/help-utils.js
View File

@ -1,6 +1,6 @@
const { wrap } = require('@joplinapp/lib/string-utils.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { _ } = require('@joplinapp/lib/locale');
const { wrap } = require('@joplin/lib/string-utils.js');
const Setting = require('@joplin/lib/models/Setting').default;
const { _ } = require('@joplin/lib/locale');
const MAX_WIDTH = 78;
const INDENT = ' ';

34
packages/app-cli/app/main.js
View File

@ -11,24 +11,24 @@ if (compareVersion(nodeVersion, '10.0.0') < 0) {
}
const { app } = require('./app.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const NoteTag = require('@joplinapp/lib/models/NoteTag.js');
const MasterKey = require('@joplinapp/lib/models/MasterKey');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Revision = require('@joplinapp/lib/models/Revision.js');
const Logger = require('@joplinapp/lib/Logger').default;
const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Resource = require('@joplin/lib/models/Resource.js');
const BaseItem = require('@joplin/lib/models/BaseItem.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const NoteTag = require('@joplin/lib/models/NoteTag.js');
const MasterKey = require('@joplin/lib/models/MasterKey');
const Setting = require('@joplin/lib/models/Setting').default;
const Revision = require('@joplin/lib/models/Revision.js');
const Logger = require('@joplin/lib/Logger').default;
const FsDriverNode = require('@joplin/lib/fs-driver-node').default;
const sharp = require('sharp');
const { shimInit } = require('@joplinapp/lib/shim-init-node.js');
const shim = require('@joplinapp/lib/shim').default;
const { _ } = require('@joplinapp/lib/locale');
const { FileApiDriverLocal } = require('@joplinapp/lib/file-api-driver-local.js');
const EncryptionService = require('@joplinapp/lib/services/EncryptionService');
const envFromArgs = require('@joplinapp/lib/envFromArgs');
const { shimInit } = require('@joplin/lib/shim-init-node.js');
const shim = require('@joplin/lib/shim').default;
const { _ } = require('@joplin/lib/locale');
const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local.js');
const EncryptionService = require('@joplin/lib/services/EncryptionService');
const envFromArgs = require('@joplin/lib/envFromArgs');
const env = envFromArgs(process.argv);

12
packages/app-cli/app/services/plugins/PluginRunner.ts
View File

@ -1,10 +1,10 @@
import * as vm from 'vm';
import Plugin from '@joplinapp/lib/services/plugins/Plugin';
import sandboxProxy from '@joplinapp/lib/services/plugins/sandboxProxy';
import BasePluginRunner from '@joplinapp/lib/services/plugins/BasePluginRunner';
import executeSandboxCall from '@joplinapp/lib/services/plugins/utils/executeSandboxCall';
import Global from '@joplinapp/lib/services/plugins/api/Global';
import mapEventHandlersToIds, { EventHandlers } from '@joplinapp/lib/services/plugins/utils/mapEventHandlersToIds';
import Plugin from '@joplin/lib/services/plugins/Plugin';
import sandboxProxy from '@joplin/lib/services/plugins/sandboxProxy';
import BasePluginRunner from '@joplin/lib/services/plugins/BasePluginRunner';
import executeSandboxCall from '@joplin/lib/services/plugins/utils/executeSandboxCall';
import Global from '@joplin/lib/services/plugins/api/Global';
import mapEventHandlersToIds, { EventHandlers } from '@joplin/lib/services/plugins/utils/mapEventHandlersToIds';
function createConsoleWrapper(pluginId:string) {
const wrapper:any = {};

2
packages/app-cli/gulpfile.js
View File

@ -1,6 +1,6 @@
const gulp = require('gulp');
const fs = require('fs-extra');
const utils = require('@joplinapp/tools/gulp/utils');
const utils = require('@joplin/tools/gulp/utils');
const tasks = {
// compileExtensions: {
// fn: require('../Tools/gulp/tasks/compileExtensions.js'),

2
packages/app-cli/package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "@joplinapp/app-cli",
"name": "joplin",
"version": "1.4.3",
"lockfileVersion": 1,
"requires": true,

6
packages/app-cli/package.json
View File

@ -38,8 +38,8 @@
"node": ">=10.0.0"
},
"dependencies": {
"@joplinapp/lib": "^1.0.9",
"@joplinapp/renderer": "^1.0.17",
"@joplin/lib": "^1.0.9",
"@joplin/renderer": "^1.0.17",
"aws-sdk": "^2.588.0",
"chalk": "^4.1.0",
"clean-html": "^1.5.0",
@ -64,7 +64,7 @@
"yargs-parser": "^7.0.0"
},
"devDependencies": {
"@joplinapp/tools": "^1.0.9",
"@joplin/tools": "^1.0.9",
"@types/jasmine": "^3.6.0",
"@types/node": "^14.14.6",
"gulp": "^4.0.2",

4
packages/app-cli/tests/ArrayUtils.js
View File

@ -1,9 +1,9 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const ArrayUtils = require('@joplinapp/lib/ArrayUtils');
const ArrayUtils = require('@joplin/lib/ArrayUtils');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

4
packages/app-cli/tests/EnexToHtml.js
View File

@ -1,7 +1,7 @@
const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
const shim = require('@joplinapp/lib/shim').default;
const { enexXmlToHtml } = require('@joplinapp/lib/import-enex-html-gen.js');
const shim = require('@joplin/lib/shim').default;
const { enexXmlToHtml } = require('@joplin/lib/import-enex-html-gen.js');
const cleanHtml = require('clean-html');
process.on('unhandledRejection', (reason, p) => {

14
packages/app-cli/tests/EnexToMd.js
View File

@ -2,14 +2,14 @@
const os = require('os');
const time = require('@joplinapp/lib/time').default;
const { filename } = require('@joplinapp/lib/path-utils');
const time = require('@joplin/lib/time').default;
const { filename } = require('@joplin/lib/path-utils');
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const { enexXmlToMd } = require('@joplinapp/lib/import-enex-md-gen.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

16
packages/app-cli/tests/HtmlToHtml.js
View File

@ -2,15 +2,15 @@
const os = require('os');
const time = require('@joplinapp/lib/time').default;
const { filename } = require('@joplinapp/lib/path-utils');
const time = require('@joplin/lib/time').default;
const { filename } = require('@joplin/lib/path-utils');
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const HtmlToHtml = require('@joplinapp/renderer/HtmlToHtml');
const { enexXmlToMd } = require('@joplinapp/lib/import-enex-md-gen.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
const HtmlToHtml = require('@joplin/renderer/HtmlToHtml');
const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

16
packages/app-cli/tests/HtmlToMd.js
View File

@ -2,15 +2,15 @@
const os = require('os');
const time = require('@joplinapp/lib/time').default;
const { filename } = require('@joplinapp/lib/path-utils');
const time = require('@joplin/lib/time').default;
const { filename } = require('@joplin/lib/path-utils');
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const HtmlToMd = require('@joplinapp/lib/HtmlToMd');
const { enexXmlToMd } = require('@joplinapp/lib/import-enex-md-gen.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
const HtmlToMd = require('@joplin/lib/HtmlToMd');
const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

4
packages/app-cli/tests/InMemoryCache.ts
View File

@ -1,5 +1,5 @@
import InMemoryCache from '@joplinapp/lib/InMemoryCache';
const time = require('@joplinapp/lib/time').default;
import InMemoryCache from '@joplin/lib/InMemoryCache';
const time = require('@joplin/lib/time').default;
describe('InMemoryCache', function() {

2
packages/app-cli/tests/MarkupToHtml.js
View File

@ -1,6 +1,6 @@
const { asyncTest } = require('./test-utils.js');
const MarkupToHtml = require('@joplinapp/renderer/MarkupToHtml').default;
const MarkupToHtml = require('@joplin/renderer/MarkupToHtml').default;
describe('MarkupToHtml', function() {

8
packages/app-cli/tests/MdToHtml.ts
View File

@ -1,9 +1,9 @@
import MdToHtml from '@joplinapp/renderer/MdToHtml';
import MdToHtml from '@joplin/renderer/MdToHtml';
const os = require('os');
const { filename } = require('@joplinapp/lib/path-utils');
const { filename } = require('@joplin/lib/path-utils');
const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
const shim = require('@joplinapp/lib/shim').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const shim = require('@joplin/lib/shim').default;
const { themeStyle } = require('@joplin/lib/theme');
function newTestMdToHtml(options:any = null) {
options = {

4
packages/app-cli/tests/MdToMd.js
View File

@ -1,5 +1,5 @@
const mdImporterService = require('@joplinapp/lib/services/interop/InteropService_Importer_Md').default;
const Note = require('@joplinapp/lib/models/Note.js');
const mdImporterService = require('@joplin/lib/services/interop/InteropService_Importer_Md').default;
const Note = require('@joplin/lib/models/Note.js');
const { setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
const importer = new mdImporterService();

2
packages/app-cli/tests/StringUtils.js
View File

@ -2,7 +2,7 @@
const { asyncTest } = require('./test-utils.js');
const StringUtils = require('@joplinapp/lib/string-utils');
const StringUtils = require('@joplin/lib/string-utils');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

2
packages/app-cli/tests/TaskQueue.js
View File

@ -2,7 +2,7 @@
const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const TaskQueue = require('@joplinapp/lib/TaskQueue.js');
const TaskQueue = require('@joplin/lib/TaskQueue.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

14
packages/app-cli/tests/database.js
View File

@ -1,14 +1,14 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const ArrayUtils = require('@joplinapp/lib/ArrayUtils.js');
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Setting = require('@joplin/lib/models/Setting').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const ArrayUtils = require('@joplin/lib/ArrayUtils.js');
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

2
packages/app-cli/tests/eventManager.js
View File

@ -2,7 +2,7 @@
const { asyncTest,checkThrow } = require('./test-utils.js');
const eventManager = require('@joplinapp/lib/eventManager').default;
const eventManager = require('@joplin/lib/eventManager').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

10
packages/app-cli/tests/feature_NoteHistory.js
View File

@ -1,10 +1,10 @@
const { asyncTest, id, ids, createNTestFolders, sortedIds, createNTestNotes, TestApp } = require('./test-utils.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const uuid = require('@joplinapp/lib/uuid').default;
const Note = require('@joplinapp/lib/models/Note.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const uuid = require('@joplin/lib/uuid').default;
const Note = require('@joplin/lib/models/Note.js');
const Folder = require('@joplin/lib/models/Folder.js');
const { ALL_NOTES_FILTER_ID } = require('@joplinapp/lib/reserved-ids.js');
const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids.js');
let testApp = null;

10
packages/app-cli/tests/feature_NoteList.js
View File

@ -1,10 +1,10 @@
/* eslint-disable no-unused-vars */
const { setupDatabaseAndSynchronizer, switchClient, asyncTest, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const time = require('@joplinapp/lib/time').default;
const Setting = require('@joplin/lib/models/Setting').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const time = require('@joplin/lib/time').default;
let testApp = null;

12
packages/app-cli/tests/feature_ShowAllNotes.js
View File

@ -1,11 +1,11 @@
/* eslint-disable no-unused-vars */
const { setupDatabaseAndSynchronizer, switchClient, asyncTest, id, ids, sortedIds, at, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const time = require('@joplinapp/lib/time').default;
const { ALL_NOTES_FILTER_ID } = require('@joplinapp/lib/reserved-ids.js');
const Setting = require('@joplin/lib/models/Setting').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const time = require('@joplin/lib/time').default;
const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids.js');
//
// The integration tests are to test the integration of the core system, comprising the

10
packages/app-cli/tests/feature_TagList.js
View File

@ -1,10 +1,10 @@
/* eslint-disable no-unused-vars */
const { setupDatabaseAndSynchronizer, switchClient, asyncTest, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const time = require('@joplinapp/lib/time').default;
const Setting = require('@joplin/lib/models/Setting').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const time = require('@joplin/lib/time').default;
let testApp = null;

8
packages/app-cli/tests/file_api_driver.js
View File

@ -1,12 +1,12 @@
/* eslint-disable no-unused-vars */
const uuid = require('@joplinapp/lib/uuid').default;
const time = require('@joplinapp/lib/time').default;
const uuid = require('@joplin/lib/uuid').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, sleep, fileApi, fileContentEqual, checkThrowAsync } = require('./test-utils.js');
const shim = require('@joplinapp/lib/shim').default;
const shim = require('@joplin/lib/shim').default;
const fs = require('fs-extra');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Setting = require('@joplin/lib/models/Setting').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

4
packages/app-cli/tests/filterParser.js
View File

@ -1,7 +1,7 @@
/* eslint-disable no-unused-vars */
const filterParser = require('@joplinapp/lib/services/searchengine/filterParser.js').default;
// import filterParser from '@joplinapp/lib/services/searchengine/filterParser.js';
const filterParser = require('@joplin/lib/services/searchengine/filterParser.js').default;
// import filterParser from '@joplin/lib/services/searchengine/filterParser.js';
const makeTerm = (name, value, negated, quoted = false, wildcard = false) => {
if (name === 'text') { return { name, value, negated, quoted, wildcard }; }

4
packages/app-cli/tests/fsDriver.ts
View File

@ -1,5 +1,5 @@
import FsDriverNode from '@joplinapp/lib/fs-driver-node';
import shim from '@joplinapp/lib/shim';
import FsDriverNode from '@joplin/lib/fs-driver-node';
import shim from '@joplin/lib/shim';
const { expectThrow } = require('./test-utils.js');
// On Windows, path.resolve is going to convert a path such as

2
packages/app-cli/tests/htmlUtils.js
View File

@ -2,7 +2,7 @@
const { asyncTest } = require('./test-utils.js');
const htmlUtils = require('@joplinapp/lib/htmlUtils.js');
const htmlUtils = require('@joplin/lib/htmlUtils.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

2
packages/app-cli/tests/markdownUtils.js
View File

@ -2,7 +2,7 @@
const { asyncTest } = require('./test-utils.js');
const markdownUtils = require('@joplinapp/lib/markdownUtils').default;
const markdownUtils = require('@joplin/lib/markdownUtils').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

4
packages/app-cli/tests/mimeUtils.js
View File

@ -1,9 +1,9 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime;
const mimeUtils = require('@joplin/lib/mime-utils.js').mime;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

14
packages/app-cli/tests/models_BaseItem.js
View File

@ -1,14 +1,14 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const BaseItem = require('@joplin/lib/models/BaseItem.js');
const Resource = require('@joplin/lib/models/Resource.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

10
packages/app-cli/tests/models_Folder.js
View File

@ -1,12 +1,12 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

14
packages/app-cli/tests/models_ItemChange.js
View File

@ -1,14 +1,14 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, revisionService, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine');
const ResourceService = require('@joplinapp/lib/services/ResourceService');
const ItemChangeUtils = require('@joplinapp/lib/services/ItemChangeUtils');
const Note = require('@joplinapp/lib/models/Note');
const Setting = require('@joplinapp/lib/models/Setting').default;
const ItemChange = require('@joplinapp/lib/models/ItemChange');
const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine');
const ResourceService = require('@joplin/lib/services/ResourceService');
const ItemChangeUtils = require('@joplin/lib/services/ItemChangeUtils');
const Note = require('@joplin/lib/models/Note');
const Setting = require('@joplin/lib/models/Setting').default;
const ItemChange = require('@joplin/lib/models/ItemChange');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

14
packages/app-cli/tests/models_Note.js
View File

@ -1,14 +1,14 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const ArrayUtils = require('@joplinapp/lib/ArrayUtils.js');
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Setting = require('@joplin/lib/models/Setting').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const ArrayUtils = require('@joplin/lib/ArrayUtils.js');
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

14
packages/app-cli/tests/models_Note_CustomSortOrder.js
View File

@ -1,14 +1,14 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const ArrayUtils = require('@joplinapp/lib/ArrayUtils.js');
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Setting = require('@joplin/lib/models/Setting').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const ArrayUtils = require('@joplin/lib/ArrayUtils.js');
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

12
packages/app-cli/tests/models_Resource.js
View File

@ -1,13 +1,13 @@
/* eslint-disable no-unused-vars, require-atomic-updates */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Resource = require('@joplin/lib/models/Resource.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

16
packages/app-cli/tests/models_Revision.js
View File

@ -1,15 +1,15 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const NoteTag = require('@joplinapp/lib/models/NoteTag.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const Revision = require('@joplinapp/lib/models/Revision.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const NoteTag = require('@joplin/lib/models/NoteTag.js');
const Tag = require('@joplin/lib/models/Tag.js');
const Revision = require('@joplin/lib/models/Revision.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

2
packages/app-cli/tests/models_Setting.ts
View File

@ -1,4 +1,4 @@
import Setting from '@joplinapp/lib/models/Setting';
import Setting from '@joplin/lib/models/Setting';
const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('./test-utils.js');

14
packages/app-cli/tests/models_Tag.js
View File

@ -1,14 +1,14 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const NoteTag = require('@joplinapp/lib/models/NoteTag.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const NoteTag = require('@joplin/lib/models/NoteTag.js');
const Tag = require('@joplin/lib/models/Tag.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

2
packages/app-cli/tests/pathUtils.js
View File

@ -1,7 +1,7 @@
/* eslint-disable no-unused-vars */
const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('@joplinapp/lib/path-utils');
const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('@joplin/lib/path-utils');
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
process.on('unhandledRejection', (reason, p) => {

10
packages/app-cli/tests/reducer.js
View File

@ -1,11 +1,11 @@
/* eslint-disable no-unused-vars */
const { setupDatabaseAndSynchronizer, switchClient, asyncTest, createNTestNotes, createNTestFolders, createNTestTags } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const reducer = require('@joplinapp/lib/reducer').default;
const { defaultState, stateUtils, MAX_HISTORY } = require('@joplinapp/lib/reducer');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const reducer = require('@joplin/lib/reducer').default;
const { defaultState, stateUtils, MAX_HISTORY } = require('@joplin/lib/reducer');
function initTestState(folders, selectedFolderIndex, notes, selectedNoteIndexes, tags = null, selectedTagIndex = null) {
let state = defaultState;

2
packages/app-cli/tests/services/plugins/api/JoplinSetting.ts
View File

@ -1,4 +1,4 @@
// import Setting from '@joplinapp/lib/models/Setting';
// import Setting from '@joplin/lib/models/Setting';
// const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('../test-utils.js');

2
packages/app-cli/tests/services/plugins/sandboxProxy.ts
View File

@ -1,4 +1,4 @@
import sandboxProxy, { Target } from '@joplinapp/lib/services/plugins/sandboxProxy';
import sandboxProxy, { Target } from '@joplin/lib/services/plugins/sandboxProxy';
const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('../../test-utils.js');

6
packages/app-cli/tests/services_CommandService.ts
View File

@ -1,6 +1,6 @@
import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils';
import ToolbarButtonUtils from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import CommandService, { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import MenuUtils from '@joplin/lib/services/commands/MenuUtils';
import ToolbarButtonUtils from '@joplin/lib/services/commands/ToolbarButtonUtils';
import CommandService, { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('./test-utils.js');

22
packages/app-cli/tests/services_EncryptionService.js
View File

@ -1,18 +1,18 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const { Database } = require('@joplinapp/lib/database.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const BaseItem = require('@joplinapp/lib/models/BaseItem.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const MasterKey = require('@joplinapp/lib/models/MasterKey');
const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry.js');
const EncryptionService = require('@joplinapp/lib/services/EncryptionService.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const { Database } = require('@joplin/lib/database.js');
const Setting = require('@joplin/lib/models/Setting').default;
const BaseItem = require('@joplin/lib/models/BaseItem.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const MasterKey = require('@joplin/lib/models/MasterKey');
const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry.js');
const EncryptionService = require('@joplin/lib/services/EncryptionService.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

16
packages/app-cli/tests/services_InteropService.ts
View File

@ -1,15 +1,15 @@
import InteropService from '@joplinapp/lib/services/interop/InteropService';
import { CustomExportContext, CustomImportContext, Module, ModuleType } from '@joplinapp/lib/services/interop/types';
import shim from '@joplinapp/lib/shim';
import InteropService from '@joplin/lib/services/interop/InteropService';
import { CustomExportContext, CustomImportContext, Module, ModuleType } from '@joplin/lib/services/interop/types';
import shim from '@joplin/lib/shim';
const { asyncTest, fileContentEqual, setupDatabaseAndSynchronizer, switchClient, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const Resource = require('@joplin/lib/models/Resource.js');
const fs = require('fs-extra');
const ArrayUtils = require('@joplinapp/lib/ArrayUtils');
const ArrayUtils = require('@joplin/lib/ArrayUtils');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

12
packages/app-cli/tests/services_InteropService_Exporter_Md.js
View File

@ -3,12 +3,12 @@
const fs = require('fs-extra');
const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
const InteropService_Exporter_Md = require('@joplinapp/lib/services/interop/InteropService_Exporter_Md').default;
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const Note = require('@joplinapp/lib/models/Note.js');
const shim = require('@joplinapp/lib/shim').default;
const InteropService_Exporter_Md = require('@joplin/lib/services/interop/InteropService_Exporter_Md').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Resource = require('@joplin/lib/models/Resource.js');
const Note = require('@joplin/lib/models/Note.js');
const shim = require('@joplin/lib/shim').default;
const exportDir = `${__dirname}/export`;

2
packages/app-cli/tests/services_KeymapService.js
View File

@ -1,6 +1,6 @@
const { tempFilePath } = require('./test-utils.js');
const KeymapService = require('@joplinapp/lib/services/KeymapService').default;
const KeymapService = require('@joplin/lib/services/KeymapService').default;
const keymapService = KeymapService.instance();
keymapService.initialize([]);

2
packages/app-cli/tests/services_KvStore.js
View File

@ -2,7 +2,7 @@
const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const KvStore = require('@joplinapp/lib/services/KvStore.js');
const KvStore = require('@joplin/lib/services/KvStore.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

12
packages/app-cli/tests/services_PluginService.ts
View File

@ -1,12 +1,12 @@
import PluginRunner from '../app/services/plugins/PluginRunner';
import PluginService from '@joplinapp/lib/services/plugins/PluginService';
import { ContentScriptType } from '@joplinapp/lib/services/plugins/api/types';
import MdToHtml from '@joplinapp/renderer/MdToHtml';
import shim from '@joplinapp/lib/shim';
import PluginService from '@joplin/lib/services/plugins/PluginService';
import { ContentScriptType } from '@joplin/lib/services/plugins/api/types';
import MdToHtml from '@joplin/renderer/MdToHtml';
import shim from '@joplin/lib/shim';
const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('./test-utils.js');
const Note = require('@joplinapp/lib/models/Note');
const Folder = require('@joplinapp/lib/models/Folder');
const Note = require('@joplin/lib/models/Note');
const Folder = require('@joplin/lib/models/Folder');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

28
packages/app-cli/tests/services_ResourceService.js
View File

@ -1,22 +1,22 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, resourceService, decryptionWorker, encryptionService, loadEncryptionMasterKey, allSyncTargetItemsEncrypted, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const InteropService = require('@joplinapp/lib/services/interop/InteropService').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const NoteTag = require('@joplinapp/lib/models/NoteTag.js');
const Resource = require('@joplinapp/lib/models/Resource.js');
const ItemChange = require('@joplinapp/lib/models/ItemChange.js');
const NoteResource = require('@joplinapp/lib/models/NoteResource.js');
const ResourceService = require('@joplinapp/lib/services/ResourceService.js');
const InteropService = require('@joplin/lib/services/interop/InteropService').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const NoteTag = require('@joplin/lib/models/NoteTag.js');
const Resource = require('@joplin/lib/models/Resource.js');
const ItemChange = require('@joplin/lib/models/ItemChange.js');
const NoteResource = require('@joplin/lib/models/NoteResource.js');
const ResourceService = require('@joplin/lib/services/ResourceService.js');
const fs = require('fs-extra');
const ArrayUtils = require('@joplinapp/lib/ArrayUtils');
const ObjectUtils = require('@joplinapp/lib/ObjectUtils');
const shim = require('@joplinapp/lib/shim').default;
const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine');
const ArrayUtils = require('@joplin/lib/ArrayUtils');
const ObjectUtils = require('@joplin/lib/ObjectUtils');
const shim = require('@joplin/lib/shim').default;
const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

22
packages/app-cli/tests/services_Revision.js
View File

@ -1,18 +1,18 @@
/* eslint-disable no-unused-vars */
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
const Folder = require('@joplinapp/lib/models/Folder.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Note = require('@joplinapp/lib/models/Note.js');
const NoteTag = require('@joplinapp/lib/models/NoteTag.js');
const ItemChange = require('@joplinapp/lib/models/ItemChange.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const Revision = require('@joplinapp/lib/models/Revision.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const RevisionService = require('@joplinapp/lib/services/RevisionService.js');
const shim = require('@joplinapp/lib/shim').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Setting = require('@joplin/lib/models/Setting').default;
const Note = require('@joplin/lib/models/Note.js');
const NoteTag = require('@joplin/lib/models/NoteTag.js');
const ItemChange = require('@joplin/lib/models/ItemChange.js');
const Tag = require('@joplin/lib/models/Tag.js');
const Revision = require('@joplin/lib/models/Revision.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const RevisionService = require('@joplin/lib/services/RevisionService.js');
const shim = require('@joplin/lib/shim').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

10
packages/app-cli/tests/services_SearchEngine.js
View File

@ -2,12 +2,12 @@
/* eslint prefer-const: 0*/
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, mockDate, restoreDate } = require('./test-utils.js');
const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine');
const Note = require('@joplinapp/lib/models/Note');
const ItemChange = require('@joplinapp/lib/models/ItemChange');
const Setting = require('@joplinapp/lib/models/Setting').default;
const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine');
const Note = require('@joplin/lib/models/Note');
const ItemChange = require('@joplin/lib/models/ItemChange');
const Setting = require('@joplin/lib/models/Setting').default;
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

Some files were not shown because too many files have changed in this diff Show More