@mintlify/cli 4.0.1813 → 4.1.1

package/__test__/utils.ts

@@ -1,25 +0,0 @@
-import { cli } from '../src/cli.js';
-
-export async function runCommand(...args: string[]) {
-  const prevCliTestMode = process.env.CLI_TEST_MODE;
-  process.env.CLI_TEST_MODE = 'true';
-  process.argv = ['node', 'cli.js', ...args];
-  try {
-    return await cli({ packageName: 'mint' });
-  } finally {
-    if (prevCliTestMode === undefined) {
-      delete process.env.CLI_TEST_MODE;
-    } else {
-      process.env.CLI_TEST_MODE = prevCliTestMode;
-    }
-  }
-}
-
-export const mockValidOpenApiDocument = {
-  openapi: '3.0.0',
-  info: {
-    title: 'Test API',
-    version: '1.0.0',
-  },
-  components: {},
-};

package/__test__/validateCommand.test.ts

@@ -1,647 +0,0 @@
-import { addLog, checkBuild } from '@mintlify/previewing';
-import fs from 'fs-extra';
-import path from 'node:path';
-import { mockProcessExit } from 'vitest-mock-process';
-
-import { sendPublishPrompt } from '../src/signup.js';
-import type { Report } from '../src/validate/report.js';
-import { runCommand } from './utils.js';
-
-const { dir } = vi.hoisted(() => ({
-  dir: `${process.env.TMPDIR ?? '/tmp'}/validate-command-${process.pid}`,
-}));
-
-vi.mock('../src/helpers.js', async (importOriginal) => {
-  const mod = await importOriginal<typeof import('../src/helpers.js')>();
-  return { ...mod, CMD_EXEC_PATH: dir, autoUpgradeIfNeeded: vi.fn() };
-});
-
-vi.mock('../src/signup.js', async (importOriginal) => {
-  const mod = await importOriginal<typeof import('../src/signup.js')>();
-  return { ...mod, sendPublishPrompt: vi.fn() };
-});
-
-vi.mock('@mintlify/previewing', async (importOriginal) => {
-  const mod = await importOriginal<typeof import('@mintlify/previewing')>();
-  return { ...mod, addLog: vi.fn(), checkBuild: vi.fn() };
-});
-
-const processExitMock = mockProcessExit();
-
-const HOME = '---\ntitle: Home\n---\n\nBody\n';
-
-const writeSite = (files: Record<string, string>, config: Record<string, unknown> = {}) => {
-  fs.emptyDirSync(dir);
-  fs.writeJSONSync(path.join(dir, 'docs.json'), {
-    theme: 'mint',
-    name: 'Test',
-    colors: { primary: '#000000' },
-    navigation: { pages: ['index'] },
-    ...config,
-  });
-  for (const [file, content] of Object.entries(files)) {
-    fs.outputFileSync(path.join(dir, file), content);
-  }
-};
-
-const runJson = async (...args: string[]) => {
-  const write = vi.spyOn(process.stdout, 'write').mockImplementation((...params: unknown[]) => {
-    params.find((param): param is () => void => typeof param === 'function')?.();
-    return true;
-  });
-  try {
-    await runCommand(...args, '--format', 'json');
-    return write.mock.calls.map(([chunk]) => String(chunk));
-  } finally {
-    write.mockRestore();
-  }
-};
-
-const report = async (...args: string[]) => {
-  const chunks = await runJson(...args);
-  expect(chunks).toHaveLength(1);
-  return JSON.parse(chunks[0] ?? '') as Report;
-};
-
-/** Runs in json mode expecting a failure: nothing on stdout, the error on stderr. */
-const jsonError = async (...args: string[]) => {
-  const stderr = vi.spyOn(process.stderr, 'write').mockImplementation(() => true);
-  try {
-    expect(await runJson(...args)).toEqual([]);
-    return stderr.mock.calls.map(([chunk]) => String(chunk)).join('');
-  } finally {
-    stderr.mockRestore();
-  }
-};
-
-const rules = (result: { diagnostics: { rule: string }[] }) =>
-  result.diagnostics.map(({ rule }) => rule);
-
-describe('mint validate', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(checkBuild).mockResolvedValue({ passed: true, warnings: [] });
-  });
-
-  afterAll(() => {
-    fs.removeSync(dir);
-  });
-
-  it('exits only after stdout has flushed the JSON report', async () => {
-    writeSite({ 'index.mdx': HOME });
-    let flush: (() => void) | undefined;
-    const write = vi.spyOn(process.stdout, 'write').mockImplementation((...params: unknown[]) => {
-      flush = params.find((param): param is () => void => typeof param === 'function');
-      return true;
-    });
-    try {
-      const run = runCommand('validate', '--no-build', '--format', 'json');
-      await vi.waitFor(() => expect(write).toHaveBeenCalled());
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      expect(processExitMock).not.toHaveBeenCalled();
-
-      flush?.();
-      await run;
-      expect(processExitMock).toHaveBeenCalledWith(0);
-    } finally {
-      write.mockRestore();
-    }
-  });
-
-  it('prints one JSON report with a summary and every diagnostic', async () => {
-    writeSite({ 'index.mdx': '---\ntitle: Home\n---\n\n# Home\n\nline<br>\n' });
-
-    const result = await report('validate', '--no-build');
-
-    expect(result).toEqual({
-      passed: false,
-      summary: { errors: 1, warnings: 1, byRule: { 'duplicate-h1': 1, 'void-tags': 1 } },
-      diagnostics: [
-        expect.objectContaining({
-          rule: 'duplicate-h1',
-          group: 'content',
-          severity: 'warning',
-          file: 'index.mdx',
-          line: 5,
-          fix: { file: 'index.mdx', start: 21, end: 29, text: '' },
-        }),
-        expect.objectContaining({
-          rule: 'void-tags',
-          severity: 'error',
-          line: 7,
-          fix: { file: 'index.mdx', start: 33, end: 37, text: '<br />' },
-        }),
-      ],
-      build: { ran: false, reason: 'disabled' },
-    });
-    expect(addLog).not.toHaveBeenCalled();
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('passes with warnings and runs the build', async () => {
-    writeSite({ 'index.mdx': '---\ntitle: Home\n---\n\n# Home\n' });
-
-    const result = await report('validate');
-
-    expect(result).toMatchObject({ passed: true, build: { ran: true, passed: true } });
-    expect(rules(result)).toEqual(['duplicate-h1']);
-    expect(checkBuild).toHaveBeenCalled();
-    expect(sendPublishPrompt).not.toHaveBeenCalled();
-    expect(processExitMock).toHaveBeenCalledWith(0);
-  });
-
-  it('skips the build while there are errors', async () => {
-    writeSite({ 'index.mdx': '---\ntitle: Home\n---\n\nline<br>\n' });
-
-    const result = await report('validate');
-
-    expect(result.build).toEqual({ ran: false, reason: 'errors found' });
-    expect(checkBuild).not.toHaveBeenCalled();
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('turns build warnings into diagnostics', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        {
-          type: 'missing-nav-page',
-          message: '"gone" is referenced in the docs.json navigation but the file does not exist.',
-        },
-      ],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'missing-nav-page', group: 'nav', file: 'docs.json' }),
-    ]);
-    expect(result.build).toEqual({ ran: true, passed: false });
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('attributes a missing nav page that looks like a file to the config', async () => {
-    writeSite({ 'index.mdx': HOME }, { navigation: { pages: ['index', 'guides/setup.md'] } });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        {
-          type: 'missing-nav-page',
-          message:
-            '"guides/setup.md" is referenced in the docs.json navigation but the file does not exist.',
-        },
-      ],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({
-        rule: 'missing-nav-page',
-        file: 'docs.json',
-        line: expect.any(Number),
-      }),
-    ]);
-  });
-
-  it('reports a build failure no rule explains', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'boom',
-      strict: false,
-      warnings: [],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'build-failed', message: 'boom' }),
-    ]);
-  });
-
-  it('passes when the build fails only on disabled rules', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        {
-          type: 'missing-nav-page',
-          message: '"gone" is referenced in the docs.json navigation but the file does not exist.',
-        },
-      ],
-    });
-
-    const result = await report('validate', '--disable', 'missing-nav-page');
-
-    expect(result).toMatchObject({ passed: true, build: { ran: true, passed: false } });
-    expect(rules(result)).toEqual([]);
-    expect(processExitMock).toHaveBeenCalledWith(0);
-  });
-
-  it('fails on a build error even when a disabled rule covers its warnings', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Unexpected token } in docs.json',
-      strict: false,
-      warnings: [{ type: 'openapi', message: 'Could not read OpenAPI overlay settings' }],
-    });
-
-    const result = await report('validate', '--disable', 'openapi');
-
-    expect(result.passed).toBe(false);
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'build-failed', message: 'Unexpected token } in docs.json' }),
-    ]);
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('skips OpenAPI generation in the build only when no openapi rule is selected', async () => {
-    writeSite({ 'index.mdx': HOME });
-
-    await report('validate', '--disable', 'openapi');
-    expect(checkBuild).toHaveBeenLastCalledWith(expect.objectContaining({ disableOpenapi: true }));
-
-    await report('validate');
-    expect(checkBuild).toHaveBeenLastCalledWith(expect.objectContaining({ disableOpenapi: false }));
-  });
-
-  it('cleans build warning messages and lifts their position', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        { type: 'parse-error', message: '\n\u001b[31m./index.mdx:3:7 Unexpected token\u001b[39m' },
-      ],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({
-        rule: 'parse-error',
-        file: 'index.mdx',
-        line: 3,
-        column: 7,
-        message: './index.mdx:3:7 Unexpected token',
-      }),
-    ]);
-  });
-
-  it('prefers structured warning fields over the message text', async () => {
-    writeSite(
-      { 'index.mdx': HOME, 'guides/real.mdx': HOME },
-      { navigation: { pages: ['index', 'guides/real', 'gone'] } }
-    );
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 2 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        {
-          type: 'parse-error',
-          message: '\u001b[31m./wrong.mdx:9:9 Unexpected token\u001b[39m',
-          file: 'guides/real.mdx',
-          line: 3,
-          column: 7,
-        },
-        {
-          type: 'missing-nav-page',
-          message: '"gone" is referenced in the docs.json navigation but the file does not exist.',
-          file: 'docs.json',
-          ref: 'gone',
-        },
-      ],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics).toHaveLength(2);
-    expect(result.diagnostics).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          rule: 'parse-error',
-          file: 'guides/real.mdx',
-          line: 3,
-          column: 7,
-          message: './wrong.mdx:9:9 Unexpected token',
-        }),
-        expect.objectContaining({
-          rule: 'missing-nav-page',
-          file: 'docs.json',
-          line: expect.any(Number),
-        }),
-      ])
-    );
-  });
-
-  it('fails when the build fails on a parse error outside --files', async () => {
-    writeSite({ 'index.mdx': HOME, 'other.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [{ type: 'parse-error', message: './other.mdx:3:7 Unexpected token' }],
-    });
-
-    const result = await report('validate', '--files', 'index.mdx');
-
-    expect(result.passed).toBe(false);
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'build-failed', file: 'other.mdx' }),
-    ]);
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('attributes import warnings to the importing page', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 3 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        {
-          type: 'missing-file',
-          message: 'Could not find file snippets/gone.mdx - imported from index.mdx',
-        },
-        {
-          type: 'invalid-import-path',
-          message:
-            'Invalid import path https://example.com/a.jsx in index.mdx. Only local imports are supported.',
-        },
-        {
-          type: 'export-collision',
-          message: 'Widget is exported by snippets/a.jsx (in index.mdx, importing snippets/b.mdx)',
-        },
-      ],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics.map(({ file }: { file: string }) => file)).toEqual([
-      'index.mdx',
-      'index.mdx',
-      'index.mdx',
-    ]);
-  });
-
-  it('reports missing imported files with the content group', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [
-        {
-          type: 'missing-file',
-          message: 'Could not find file snippets/gone.mdx - imported from index.mdx',
-        },
-      ],
-    });
-
-    const result = await report('validate', '--disable', 'all', '--enable', 'content');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'missing-file', group: 'content', file: 'index.mdx' }),
-    ]);
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('keeps skipped-spec notices as warnings', async () => {
-    writeSite({ 'index.mdx': HOME }, { api: { openapi: 'http://example.com/openapi.json' } });
-
-    const result = await report('validate', '--no-build');
-
-    expect(result.passed).toBe(true);
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({
-        rule: 'openapi-spec',
-        severity: 'warning',
-        message: expect.stringContaining('--local-schema'),
-      }),
-      expect.objectContaining({
-        rule: 'openapi-spec',
-        severity: 'warning',
-        message: 'only https protocol is supported in production',
-      }),
-    ]);
-  });
-
-  it('exits 2 when the build could not be prepared', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockRejectedValue(new Error('requires an internet connection'));
-
-    expect(await jsonError('validate')).toBe('Error: requires an internet connection\n');
-    expect(processExitMock).toHaveBeenCalledWith(2);
-  });
-
-  it('keeps console output during the build off stdout in json mode', async () => {
-    writeSite({ 'index.mdx': HOME });
-    vi.mocked(checkBuild).mockImplementation(async () => {
-      console.log('progress line');
-      return { passed: true, warnings: [] };
-    });
-    const stderr = vi.spyOn(process.stderr, 'write').mockImplementation(() => true);
-
-    const result = await report('validate');
-
-    const errors = stderr.mock.calls.map(([chunk]) => String(chunk));
-    stderr.mockRestore();
-    expect(result.passed).toBe(true);
-    expect(errors).toContain('progress line\n');
-  });
-
-  it('applies fixes with --fix, lists them and leaves unfixable issues', async () => {
-    writeSite({ 'index.mdx': '---\ntitle: Home\n---\n\nline<br>\n\n<Missing />\n' });
-
-    const result = await report('validate', '--no-build', '--fix');
-
-    expect(fs.readFileSync(path.join(dir, 'index.mdx'), 'utf-8')).toContain('line<br />');
-    expect(result.fixed).toEqual([
-      {
-        rule: 'void-tags',
-        file: 'index.mdx',
-        line: 5,
-        column: 5,
-        before: '<br>',
-        after: '<br />',
-      },
-    ]);
-    expect(rules(result)).toEqual(['unknown-component']);
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('turns rules and groups on and off', async () => {
-    writeSite({
-      'index.mdx': '---\ntitle: Home\n---\n\n# Home\n\nline<br>\n',
-    });
-
-    // Without void-tags, nothing makes the page parseable
-    expect(rules(await report('validate', '--no-build', '--disable', 'content'))).toEqual([
-      'parse-error',
-    ]);
-    expect(rules(await report('validate', '--no-build', '--disable', 'all'))).toEqual([
-      'parse-error',
-    ]);
-    expect(
-      rules(await report('validate', '--no-build', '--disable', 'all', '--enable', 'void-tags'))
-    ).toEqual(['void-tags']);
-    expect(
-      rules(await report('validate', '--no-build', '--disable', 'openapi, duplicate-h1'))
-    ).toEqual(['void-tags']);
-  });
-
-  it('rejects unknown rules and disabling parse-error', async () => {
-    writeSite({ 'index.mdx': HOME });
-
-    expect(await jsonError('validate', '--disable', 'nope')).toContain(
-      'Error: unknown rule or group "nope"'
-    );
-    expect(processExitMock).toHaveBeenLastCalledWith(2);
-
-    expect(await jsonError('validate', '--disable', 'parse-error')).toBe(
-      "Error: parse-error always runs and can't be disabled\n"
-    );
-  });
-
-  it('limits page findings to --files', async () => {
-    writeSite(
-      {
-        'index.mdx': '---\ntitle: Home\n---\n\nline<br>\n',
-        'other.mdx': '---\ntitle: Other\n---\n\n# Other\n\nline<br>\n',
-      },
-      { navigation: { pages: ['index', 'other'] } }
-    );
-
-    const result = await report('validate', '--no-build', '--files', 'other.mdx');
-
-    expect(result.diagnostics.map(({ file }: { file: string }) => file)).toEqual([
-      'other.mdx',
-      'other.mdx',
-    ]);
-  });
-
-  it('posix-normalizes Windows paths in build warnings', async () => {
-    writeSite({ 'index.mdx': HOME, 'snippets/card.mdx': 'Card\n' });
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [{ type: 'parse-error', message: '.\\snippets\\card.mdx:2:1 Unexpected token' }],
-    });
-
-    const result = await report('validate');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'parse-error', file: 'snippets/card.mdx', line: 2 }),
-    ]);
-  });
-
-  it('checks every OpenAPI spec and sorts findings by file', async () => {
-    writeSite({ 'index.mdx': HOME }, { api: { openapi: ['b.json', 'a.json'] } });
-    fs.writeFileSync(path.join(dir, 'a.json'), '{ not json');
-    fs.writeFileSync(path.join(dir, 'b.json'), '{ not json');
-
-    const result = await report('validate', '--no-build');
-
-    expect(result.diagnostics.map(({ rule, file }) => [rule, file])).toEqual([
-      ['openapi-spec', 'a.json'],
-      ['openapi-spec', 'b.json'],
-    ]);
-  });
-
-  it('reports invalid OpenAPI specs and skips them with --disable openapi', async () => {
-    writeSite({ 'index.mdx': HOME }, { api: { openapi: 'openapi.json' } });
-    fs.writeFileSync(path.join(dir, 'openapi.json'), '{ not json');
-
-    expect(rules(await report('validate', '--no-build'))).toEqual(['openapi-spec']);
-    expect(rules(await report('validate', '--no-build', '--disable', 'openapi'))).toEqual([]);
-  });
-
-  it('checks the OpenAPI specs a mint.json lists', async () => {
-    writeSite({ 'index.mdx': HOME });
-    fs.removeSync(path.join(dir, 'docs.json'));
-    fs.writeJSONSync(path.join(dir, 'mint.json'), {
-      name: 'Test',
-      colors: { primary: '#000000' },
-      navigation: [{ group: 'Home', pages: ['index'] }],
-      openapi: 'openapi.json',
-    });
-    fs.writeFileSync(path.join(dir, 'openapi.json'), '{ not json');
-
-    const result = await report('validate', '--no-build');
-
-    expect(result.diagnostics).toEqual([
-      expect.objectContaining({ rule: 'openapi-spec', file: 'openapi.json' }),
-    ]);
-  });
-
-  it('rejects --files that match nothing', async () => {
-    writeSite({ 'index.mdx': HOME });
-
-    expect(await jsonError('validate', '--files', 'missing.mdx')).toContain(
-      'Error: No matching files'
-    );
-    expect(processExitMock).toHaveBeenCalledWith(2);
-    expect(checkBuild).not.toHaveBeenCalled();
-  });
-
-  it('rejects the removed --disable-openapi flag', async () => {
-    writeSite({ 'index.mdx': HOME });
-    const error = vi.spyOn(console, 'error').mockImplementation(() => undefined);
-
-    await expect(runCommand('validate', '--no-build', '--disable-openapi')).rejects.toThrow();
-
-    expect(error).toHaveBeenCalledWith(expect.stringContaining('Unknown argument'));
-    error.mockRestore();
-  });
-
-  it('logs diagnostics by file and a verdict in text mode', async () => {
-    writeSite({ 'index.mdx': '---\ntitle: Home\n---\n\nline<br>\n' });
-
-    await runCommand('validate', '--no-build');
-
-    const text = JSON.stringify(vi.mocked(addLog).mock.calls);
-    expect(text).toContain('index.mdx');
-    expect(text).toContain('must be self-closed');
-    expect(text).toContain('1 error');
-    expect(processExitMock).toHaveBeenCalledWith(1);
-  });
-
-  it('prompts to publish in text mode only when the build passed', async () => {
-    writeSite({ 'index.mdx': HOME });
-
-    await runCommand('validate');
-    expect(sendPublishPrompt).toHaveBeenCalledTimes(1);
-
-    vi.mocked(checkBuild).mockResolvedValue({
-      passed: false,
-      error: 'Build validation failed with 1 warning(s). See above for details.',
-      strict: true,
-      warnings: [{ type: 'missing-nav-page', message: '"gone" is missing.' }],
-    });
-    await runCommand('validate', '--disable', 'missing-nav-page');
-    expect(sendPublishPrompt).toHaveBeenCalledTimes(1);
-    expect(processExitMock).toHaveBeenLastCalledWith(0);
-  });
-
-  it('rejects --format values other than text and json', async () => {
-    writeSite({ 'index.mdx': HOME });
-    const error = vi.spyOn(console, 'error').mockImplementation(() => undefined);
-
-    await expect(runCommand('validate', '--format', 'table')).rejects.toThrow();
-
-    expect(error).toHaveBeenCalledWith(expect.stringContaining('Invalid values'));
-    error.mockRestore();
-  });
-});